'show ip bgp neighbors 10.1.1.2 advertised-routes' fails for route-reflector-clients

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index db2a5158460b9016966ac041db25d1342d136bdf..1a8fb3562bab2d2e1da0d00dc8ebf9ebb8fccbd3 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11688,16 +11688,9 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
              }
            if (adj->attr)
              {
-               if (!CHECK_FLAG(peer->af_flags[afi][safi],
-                               PEER_FLAG_REFLECTOR_CLIENT)
-                   || bgp_flag_check(bgp, BGP_FLAG_RR_ALLOW_OUTBOUND_POLICY))
-                 {
-                   bgp_attr_dup(&attr, adj->attr);
-                   ret = bgp_output_modifier(peer, &rn->p, &attr, afi,
-                                             safi, rmap_name);
-                 }
-               else
-                 ret = RMAP_PERMIT;
+                bgp_attr_dup(&attr, adj->attr);
+                ret = bgp_output_modifier(peer, &rn->p, &attr, afi,
+                                          safi, rmap_name);
 
                if (ret != RMAP_DENY)
                  {
@@ -11732,16 +11725,6 @@ peer_adj_routes (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
       return CMD_WARNING;
     }
 
-  if (!in && (CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_REFLECTOR_CLIENT)
-             && !bgp_flag_check(peer->bgp, BGP_FLAG_RR_ALLOW_OUTBOUND_POLICY)))
-    {
-      vty_out (vty, "%% Cannot apply outgoing route-map on route-reflector clients%s",
-              VTY_NEWLINE);
-      vty_out (vty, "%% Enable bgp route-reflector allow-outbound-policy flag%s",
-              VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
   show_adj_route (vty, peer, afi, safi, in, rmap_name);
 
   return CMD_SUCCESS;