+ fixed no_set_aspath_prepend() to correctly match existing "set" statement

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index c1f12d67761ca9d08259c78200c88ea439938512..3fa3837a3743d9827f7954263744595efb768b68 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-18 Denis Ovsienko
+
+       * bgp_routemap.c: (no_set_aspath_prepend) This command cancelled
+         existing "set" command regardless if "no set" matched it or not.
+         Fixed.
+
 2007-11-13 Paul Jakma <paul.jakma@sun.com>
 
        * bgp_main.c: Small fix, format string parameters should never

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index d51375b74c70aa2097da933a52444351f3d28cb5..b246e2ab4c5f7dfdce687f6448978e6da104e5da 100644 (file)
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3018,7 +3018,16 @@ DEFUN (no_set_aspath_prepend,
        "Prepend string for a BGP AS-path attribute\n"
        "Prepend to the as-path\n")
 {
-  return bgp_route_set_delete (vty, vty->index, "as-path prepend", NULL);
+  int ret;
+  char *str;
+
+  if (argc == 0)
+    return bgp_route_set_delete (vty, vty->index, "as-path prepend", NULL);
+
+  str = argv_concat (argv, argc, 0);
+  ret = bgp_route_set_delete (vty, vty->index, "as-path prepend", str);
+  XFREE (MTYPE_TMP, str);
+  return ret;
 }
 
 ALIAS (no_set_aspath_prepend,