Merge pull request #5014 from idryzhov/7.2-fix-vtysh-prefix-list

[7.2] vtysh: fix multiple "no ip/ipv6 prefix-list sequence-number" lines in running-config

diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index 3ec2eb239d0378d28013014aaa124ebf9fc5dcbb..e56c6fbf4ef2d5350caf83beb92d6a914de86d27 100644 (file)
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -406,7 +406,9 @@ void vtysh_config_parse_line(void *arg, const char *line)
                                       == 0
                            || strncmp(line, "frr", strlen("frr")) == 0
                            || strncmp(line, "agentx", strlen("agentx")) == 0
-                           || strncmp(line, "no log", strlen("no log")) == 0)
+                           || strncmp(line, "no log", strlen("no log")) == 0
+                           || strncmp(line, "no ip prefix-list", strlen("no ip prefix-list")) == 0
+                           || strncmp(line, "no ipv6 prefix-list", strlen("no ipv6 prefix-list")) == 0)
                                config_add_line_uniq(config_top, line);
                        else
                                config_add_line(config_top, line);