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 e7650cb28e61f416bdcb7929114ec5bb91331917..942980bd860df34ea167471d14fdbe50973f617f 100644 (file)
--- 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);