From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 22 May 2017 19:43:20 +0000 (-0400)
Subject: vtysh: Cleanup some stuff(tm)
X-Git-Tag: frr-3.0-rc3~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4ed40c16514f4caec179ba51eea8b9cc3ca5866c;p=mirror_frr.git

vtysh: Cleanup some stuff(tm)

1) vtysh_config_dump was not properly indented.  Fix

2) Add VRF_NODE to be line_uniq when parsing return from sub-daemons

3) Fix 'no log monitor' to be line_uniq as well

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index e7650cb28..942980bd8 100644
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -170,7 +170,8 @@ void vtysh_config_parse_line(const char *line)
 			} else if (config->index == RMAP_NODE
 				   || config->index == INTERFACE_NODE
 				   || config->index == NS_NODE
-				   || config->index == VTY_NODE)
+				   || config->index == VTY_NODE
+				   || config->index == VRF_NODE)
 				config_add_line_uniq(config->line, line);
 			else
 				config_add_line(config->line, line);
@@ -281,7 +282,8 @@ void vtysh_config_parse_line(const char *line)
 			if (strncmp(line, "log", strlen("log")) == 0
 			    || strncmp(line, "hostname", strlen("hostname"))
 				       == 0
-			    || strncmp(line, "frr", strlen("frr")) == 0)
+			    || strncmp(line, "frr", strlen("frr")) == 0
+			    || strncmp(line, "no log", strlen("no log")) == 0)
 				config_add_line_uniq(config_top, line);
 			else
 				config_add_line(config_top, line);