* bgp_vty.c: Make "exit-address-family" work in IPv4 unicast address

	  family node.

	[backport candidate]

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 6dc1e7e01286ab77fa090388db4ecfba196e3ef2..f90bed9dfb92820b5d9b487198931daaa63b4ce0 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-09 Akihiro Mizutani <mizutani@net-chef.net>
+
+       * bgp_vty.c: Make "exit-address-family" work in IPv4 unicast address
+         family node.
+
 2005-04-08 Martin Ling <martin-quagga@earth.li>
 
        * bgp_aspath.[ch], bgp_route.c, bgp_vty.c, bgpd.[ch]: Allow to enable

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index f7a41f5bd06ea8071b925d619d7954cb85568ba1..06c4abdbc69f6124c2235b1b74a6a18864440b14 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -3954,7 +3954,8 @@ DEFUN (exit_address_family,
        "exit-address-family",
        "Exit from Address Family configuration mode\n")
 {
-  if (vty->node == BGP_IPV4M_NODE
+  if (vty->node == BGP_IPV4_NODE
+      || vty->node == BGP_IPV4M_NODE
       || vty->node == BGP_VPNV4_NODE
       || vty->node == BGP_IPV6_NODE)
     vty->node = BGP_NODE;