From: Don Slice <dslice@cumulusnetworks.com>
Date: Wed, 6 Apr 2016 12:08:42 +0000 (+0000)
Subject: bgpd: Resolve ability to add route-map out to peer-group member
X-Git-Tag: frr-2.0-rc1~989^2~1^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2bd5af06b8afaaa6b1fcac99d3c257696ca44b5a;p=mirror%2Ffrr.git

bgpd: Resolve ability to add route-map out to peer-group member

Modified the configuration code to properly allow a peer-group member
to have a route-map out applied when one does not exist on the peer-group
itself.  This capability already existed for route-map in.

Ticket: CM-10058
Signed-off-by: Don Slice
Reviewed-by: Donald Sharp
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 8a8beea470..2583358eb9 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6190,7 +6190,9 @@ bgp_config_write_filter (struct vty *vty, struct peer *peer,
                             addr, filter->map[RMAP_IN].name, VTY_NEWLINE);
       }
 
-  if (filter->map[RMAP_OUT].name && ! gfilter)
+  if (filter->map[RMAP_OUT].name)
+    if (! gfilter || ! gfilter->map[RMAP_OUT].name
+       || strcmp (filter->map[RMAP_OUT].name, gfilter->map[RMAP_OUT].name) != 0)
     {
       afi_header_vty_out (vty, afi, safi, write,
                           "  neighbor %s route-map %s out%s",