From 12e41d03bd49a60da9238694b5d8bd0bde3eff97 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 4 Feb 2015 07:01:14 +0100 Subject: pimd: merge pimd as of 2015-01-19 Welcome pimd to the Quagga daemon zoo! This is a merge of commit 77ae369 ("pimd: Log ifindex found for an interface when zebra lib reports a new connected address."), with the intermediate "reconnect" changes removed (c9adf00...d274381). d274381 is replaced with b162ab7, which includes some changes. In addition, 4 reconnect-related changes and 1 cosmetic one have been bumped out. The rebase command used to produce the branch that is merged here is: git rebase --onto b162ab7 c9adf00 77ae369 Note that 3 patches had their author rewritten from "Anonymous SR#108542 <>" (which is not a valid git author ID) to: "Savannah SR#108542 " (which is the e-mail address listed in the associated Savannah ticket) Signed-off-by: David Lamparter --- lib/command.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/command.c') diff --git a/lib/command.c b/lib/command.c index 4e8e24f491..a71cb5ddd2 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2943,6 +2943,7 @@ DEFUN (config_exit, case KEYCHAIN_NODE: case MASC_NODE: case RMAP_NODE: + case PIM_NODE: case VTY_NODE: vty->node = CONFIG_NODE; break; @@ -3000,6 +3001,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; -- cgit v1.2.3