Merge remote-tracking branch 'frr/master' into newline-redux

Lots of conflicts from CMD_WARNING_CONFIG_FAILED...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

5 files changed, 31 insertions, 31 deletions

diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index f08265600..3bc9b4b21 100644
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -69,7 +69,7 @@ DEFUN (debug_ripng_events,
        "Debug option set for ripng events\n")
 {
   ripng_debug_event = RIPNG_DEBUG_EVENT;
-  return CMD_WARNING;
+  return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (debug_ripng_packet,
@@ -112,7 +112,7 @@ DEFUN (debug_ripng_zebra,
        "Debug option set for ripng and zebra communication\n")
 {
   ripng_debug_zebra = RIPNG_DEBUG_ZEBRA;
-  return CMD_WARNING;
+  return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (no_debug_ripng_events,
@@ -176,7 +176,7 @@ DEFUN (no_debug_ripng_zebra,
        "Debug option set for ripng and zebra communication\n")
 {
   ripng_debug_zebra = 0;
-  return CMD_WARNING;
+  return CMD_WARNING_CONFIG_FAILED;
 }
 
 /* Debug node. */
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index 2abf2f9a9..e4b45c54a 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -858,7 +858,7 @@ static int
 ripng_passive_interface_set (struct vty *vty, const char *ifname)
 {
   if (ripng_passive_interface_lookup (ifname) >= 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   vector_set (Vripng_passive_interface, strdup (ifname));
 
@@ -875,7 +875,7 @@ ripng_passive_interface_unset (struct vty *vty, const char *ifname)
 
   i = ripng_passive_interface_lookup (ifname);
   if (i < 0)
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   str = vector_slot (Vripng_passive_interface, i);
   free (str);
@@ -962,7 +962,7 @@ DEFUN (ripng_network,
     {
       vty_out (vty, "There is same network configuration %s\n",
                  argv[idx_if_or_addr]->arg);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   return CMD_SUCCESS;
@@ -991,7 +991,7 @@ DEFUN (no_ripng_network,
   if (ret < 0)
     {
       vty_out (vty, "can't find network %s\n",argv[idx_if_or_addr]->arg);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   
   return CMD_SUCCESS;
diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c
index e0ca0666b..81e892d7d 100644
--- a/ripngd/ripng_offset.c
+++ b/ripngd/ripng_offset.c
@@ -126,7 +126,7 @@ ripng_offset_list_set (struct vty *vty, const char *alist,
   else
     {
       vty_out (vty, "Invalid direction: %s\n", direct_str);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   /* Check metric. */
@@ -134,7 +134,7 @@ ripng_offset_list_set (struct vty *vty, const char *alist,
   if (metric < 0 || metric > 16)
     {
       vty_out (vty, "Invalid metric: %s\n", metric_str);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   /* Get offset-list structure with interface name. */
@@ -165,7 +165,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
   else
     {
       vty_out (vty, "Invalid direction: %s\n", direct_str);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   /* Check metric. */
@@ -173,7 +173,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
   if (metric < 0 || metric > 16)
     {
       vty_out (vty, "Invalid metric: %s\n", metric_str);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   /* Get offset-list structure with interface name. */
@@ -197,7 +197,7 @@ ripng_offset_list_unset (struct vty *vty, const char *alist,
   else
     {
       vty_out (vty, "Can't find offset-list\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   return CMD_SUCCESS;
 }
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index 725336aff..b49de9902 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -338,7 +338,7 @@ DEFUN (ripng_redistribute_type,
   if (type < 0)
     {
       vty_out (vty, "Invalid type %s\n", proto);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, type, 0, VRF_DEFAULT);
@@ -364,7 +364,7 @@ DEFUN (no_ripng_redistribute_type,
   if (type < 0)
     {
       vty_out (vty, "Invalid type %s\n", proto);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng_redistribute_metric_unset (type);
@@ -392,7 +392,7 @@ DEFUN (ripng_redistribute_type_metric,
   if (type < 0)
     {
       vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng_redistribute_metric_set (type, metric);
@@ -418,7 +418,7 @@ DEFUN (ripng_redistribute_type_routemap,
   if (type < 0)
     {
       vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng_redistribute_routemap_set (type, argv[idx_word]->text);
@@ -449,7 +449,7 @@ DEFUN (ripng_redistribute_type_metric_routemap,
   if (type < 0)
     {
       vty_out (vty, "Invalid type %s\n", argv[idx_protocol]->text);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng_redistribute_metric_set (type, metric);
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 0b1faae03..8b4c3e850 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2225,7 +2225,7 @@ DEFUN_NOSH (router_ripng,
       if (ret < 0)
 	{
 	  zlog_warn ("can't create RIPng");
-	  return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
 	}
     }
 
@@ -2259,7 +2259,7 @@ DEFUN (ripng_route,
   if (ret <= 0)
     {
       vty_out (vty, "Malformed address\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   apply_mask_ipv6 (&p);
 
@@ -2268,7 +2268,7 @@ DEFUN (ripng_route,
     {
       vty_out (vty, "There is already same static route.\n");
       route_unlock_node (rp);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   rp->info = (void *)1;
 
@@ -2293,7 +2293,7 @@ DEFUN (no_ripng_route,
   if (ret <= 0)
     {
       vty_out (vty, "Malformed address\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   apply_mask_ipv6 (&p);
 
@@ -2301,7 +2301,7 @@ DEFUN (no_ripng_route,
   if (! rp)
     {
       vty_out (vty, "Can't find static route.\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng_redistribute_delete (ZEBRA_ROUTE_RIPNG, RIPNG_ROUTE_STATIC, &p, 0);
@@ -2328,7 +2328,7 @@ DEFUN (ripng_aggregate_address,
   if (ret <= 0)
     {
       vty_out (vty, "Malformed address\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   /* Check aggregate alredy exist or not. */
@@ -2337,7 +2337,7 @@ DEFUN (ripng_aggregate_address,
     {
       vty_out (vty, "There is already same aggregate route.\n");
       route_unlock_node (node);
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   node->info = (void *)1;
 
@@ -2362,14 +2362,14 @@ DEFUN (no_ripng_aggregate_address,
   if (ret <= 0)
     {
       vty_out (vty, "Malformed address\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   rn = route_node_lookup (ripng->aggregate, &p);
   if (! rn)
     {
       vty_out (vty, "Can't find aggregate route.\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
   route_unlock_node (rn);
   rn->info = NULL;
@@ -2424,7 +2424,7 @@ DEFUN (ripng_update_timer,
   if (update == ULONG_MAX || *endptr != '\0')
     {
       vty_out (vty, "update timer value error\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng->update_time = update;
@@ -2459,7 +2459,7 @@ DEFUN (ripng_timeout_timer,
   if (timeout == ULONG_MAX || *endptr != '\0')
     {
       vty_out (vty, "timeout timer value error\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng->timeout_time = timeout;
@@ -2492,7 +2492,7 @@ DEFUN (ripng_garbage_timer,
   if (garbage == ULONG_MAX || *endptr != '\0')
     {
       vty_out (vty, "garbage timer value error\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng->garbage_time = garbage;
@@ -2677,7 +2677,7 @@ DEFUN (ripng_allow_ecmp,
   if (ripng->ecmp)
     {
       vty_out (vty, "ECMP is already enabled.\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng->ecmp = 1;
@@ -2694,7 +2694,7 @@ DEFUN (no_ripng_allow_ecmp,
   if (!ripng->ecmp)
     {
       vty_out (vty, "ECMP is already disabled.\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   ripng->ecmp = 0;