summaryrefslogtreecommitdiffstats
path: root/lib/vty.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-02-04 03:41:06 +0100
committerDavid Lamparter <equinox@diac24.net>2010-02-04 03:41:06 +0100
commit447a9a8dbde95fc6ce92691491ac193f0199e2cd (patch)
tree4bfce47ead136e60cc91df50c3e79e75ddd4c83d /lib/vty.c
parent08e2c2ee9044a14f2cd9d382eec8f96189520160 (diff)
parent168595ff42c4046167b0fbae2770c037c854abd0 (diff)
downloadquagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.bz2
quagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.xz
Merge branch 'merged/pimd' into dn42
Conflicts: lib/route_types.txt
Diffstat (limited to 'lib/vty.c')
-rw-r--r--lib/vty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 9c58b50d..cae22ae7 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -712,6 +712,7 @@ vty_end_config (struct vty *vty)
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case MASC_NODE:
+ case PIM_NODE:
case VTY_NODE:
vty_config_unlock (vty);
vty->node = ENABLE_NODE;
@@ -1115,6 +1116,7 @@ vty_stop_input (struct vty *vty)
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case MASC_NODE:
+ case PIM_NODE:
case VTY_NODE:
vty_config_unlock (vty);
vty->node = ENABLE_NODE;