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>

2 files changed, 16 insertions, 16 deletions

diff --git a/eigrpd/eigrp_routemap.c b/eigrpd/eigrp_routemap.c
index 6714569140..1d85e76469 100644
--- a/eigrpd/eigrp_routemap.c
+++ b/eigrpd/eigrp_routemap.c
@@ -155,10 +155,10 @@ eigrp_route_match_add (struct vty *vty, struct route_map_index *index,
         {
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         }
     }
   return CMD_SUCCESS;
@@ -177,10 +177,10 @@ eigrp_route_match_delete (struct vty *vty, struct route_map_index *index,
         {
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         }
     }
   return CMD_SUCCESS;
@@ -200,7 +200,7 @@ eigrp_route_set_add (struct vty *vty, struct route_map_index *index,
         {
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         case RMAP_COMPILE_ERROR:
           /* rip, ripng and other protocols share the set metric command
              but only values from 0 to 16 are valid for rip and ripng
@@ -208,7 +208,7 @@ eigrp_route_set_add (struct vty *vty, struct route_map_index *index,
              other protocols. Do not return an error */
           if (strcmp(command, "metric")) {
             vty_out (vty, "%% Argument is malformed.\n");
-            return CMD_WARNING;
+            return CMD_WARNING_CONFIG_FAILED;
           }
         }
     }
@@ -229,10 +229,10 @@ eigrp_route_set_delete (struct vty *vty, struct route_map_index *index,
         {
         case RMAP_RULE_MISSING:
           vty_out (vty, "%% Can't find rule.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         case RMAP_COMPILE_ERROR:
           vty_out (vty, "%% Argument is malformed.\n");
-          return CMD_WARNING;
+          return CMD_WARNING_CONFIG_FAILED;
         }
     }
   return CMD_SUCCESS;
@@ -1125,7 +1125,7 @@ DEFUN (set_ip_nexthop,
   if (ret < 0)
     {
       vty_out (vty, "%% Malformed next-hop address\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   return eigrp_route_set_add (vty, vty->index, "ip next-hop", argv[0]);
diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c
index 5fceb85146..49fb729ca5 100644
--- a/eigrpd/eigrp_vty.c
+++ b/eigrpd/eigrp_vty.c
@@ -236,7 +236,7 @@ DEFUN (no_router_eigrp,
   if (eigrp->AS != atoi (argv[3]->arg))
     {
       vty_out (vty,"%% Attempting to deconfigure non-existent AS\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   eigrp_finish_final (eigrp);
@@ -394,7 +394,7 @@ DEFUN (eigrp_network,
   if (ret == 0)
     {
       vty_out (vty, "There is already same network statement.\n");
-      return CMD_WARNING;
+      return CMD_WARNING_CONFIG_FAILED;
     }
 
   return CMD_SUCCESS;
@@ -418,7 +418,7 @@ DEFUN (no_eigrp_network,
   if (ret == 0)
   {
     vty_out (vty,"Can't find specified network configuration.\n");
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
   }
 
   return CMD_SUCCESS;
@@ -866,7 +866,7 @@ str2auth_type (const char *str, struct interface *ifp)
 {
   /* Sanity check. */
   if (str == NULL)
-     return CMD_WARNING;
+     return CMD_WARNING_CONFIG_FAILED;
 
   if(strncmp(str, "md5",3) == 0)
     {
@@ -879,7 +879,7 @@ str2auth_type (const char *str, struct interface *ifp)
       return CMD_SUCCESS;
     }
 
-  return CMD_WARNING;
+  return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (eigrp_authentication_mode,
@@ -1032,7 +1032,7 @@ DEFUN (eigrp_redistribute_source_metric,
   argv_find (argv, argc, "redistribute", &idx);
   source = proto_redistnum(AFI_IP, argv[idx+1]->arg);
   if (source < 0 )
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   /* Get metrics values */
 
@@ -1061,7 +1061,7 @@ DEFUN (no_eigrp_redistribute_source_metric,
   argv_find (argv, argc, "redistribute", &idx);
   source = proto_redistnum(AFI_IP, argv[idx+1]->arg);
   if (source < 0 )
-    return CMD_WARNING;
+    return CMD_WARNING_CONFIG_FAILED;
 
   /* Get metrics values */