Merge pull request #2591 from LabNConsulting/working/master/bgp-delayed-default-instance

[mirror_frr.git] / bgpd / bgp_vty.c

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 641628d4b73ed3a24e9f2de9a3a4726b625dd0ea..e9d9a846af810490248a7494ac75ec2a48400b74 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -928,6 +928,14 @@ DEFUN_NOSH (router_bgp,
                        return CMD_WARNING_CONFIG_FAILED;
                }
 
+               /*
+                * If we just instantiated the default instance, complete
+                * any pending VRF-VPN leaking that was configured via
+                * earlier "router bgp X vrf FOO" blocks.
+                */
+               if (inst_type == BGP_INSTANCE_TYPE_DEFAULT)
+                       vpn_leak_postchange_all();
+
                /* Pending: handle when user tries to change a view to vrf n vv.
                 */
        }