From fd715b78d97fc64e025a81365051c2483b5a3425 Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Fri, 16 Oct 2015 20:51:38 +0000 Subject: [PATCH] quagga errors parsing a valid config Signed-off-by: Daniel Walton Reviewed-by: Donald Sharp --- lib/command.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/command.c b/lib/command.c index f6cb9dc8f1..5e8259dd39 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2805,26 +2805,30 @@ command_config_read_one_line (struct vty *vty, struct cmd_element **cmd, int use // Climb the tree and try the command again at each node if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && - ret != CMD_SUCCESS && ret != CMD_WARNING && - ret != CMD_ERR_NOTHING_TODO && vty->node != CONFIG_NODE) { + !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) && + ret != CMD_SUCCESS && + ret != CMD_WARNING && + vty->node != CONFIG_NODE) { saved_node = vty->node; while (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && - ret != CMD_SUCCESS && ret != CMD_WARNING && - ret != CMD_ERR_NOTHING_TODO && vty->node != CONFIG_NODE) { + !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) && + ret != CMD_SUCCESS && + ret != CMD_WARNING && + vty->node != CONFIG_NODE) { vty->node = node_parent(vty->node); - ret = cmd_execute_command_strict (vline, vty, NULL); + ret = cmd_execute_command_strict (vline, vty, cmd); } // If climbing the tree did not work then ignore the command and // stay at the same node if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && - ret != CMD_SUCCESS && ret != CMD_WARNING && - ret != CMD_ERR_NOTHING_TODO) + !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) && + ret != CMD_SUCCESS && + ret != CMD_WARNING) { vty->node = saved_node; - memcpy(vty->error_buf, vty->buf, VTY_BUFSIZ); } } -- 2.39.5