diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:41:06 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:41:06 +0100 |
| commit | 447a9a8dbde95fc6ce92691491ac193f0199e2cd (patch) | |
| tree | 4bfce47ead136e60cc91df50c3e79e75ddd4c83d /lib/command.c | |
| parent | 08e2c2ee9044a14f2cd9d382eec8f96189520160 (diff) | |
| parent | 168595ff42c4046167b0fbae2770c037c854abd0 (diff) | |
| download | quagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.bz2 quagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.xz | |
Merge branch 'merged/pimd' into dn42
Conflicts:
lib/route_types.txt
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/command.c b/lib/command.c index a080e5e0..290f1be0 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2371,6 +2371,7 @@ DEFUN (config_exit, case KEYCHAIN_NODE: case MASC_NODE: case RMAP_NODE: + case PIM_NODE: case VTY_NODE: vty->node = CONFIG_NODE; break; @@ -2427,6 +2428,7 @@ DEFUN (config_end, case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: case MASC_NODE: + case PIM_NODE: case VTY_NODE: vty_config_unlock (vty); vty->node = ENABLE_NODE; |