diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-13 19:56:08 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-13 19:56:08 +0000 |
| commit | f1a05de982b2466907838a7e74d7d15ad4060db2 (patch) | |
| tree | a41d430cf69e6603accec78238c8d86d59a389ad /ripd/rip_zebra.c | |
| parent | 4b8197a4f7c1b510c7a0eadc64c78e78ff98f578 (diff) | |
vtysh: return non-zero for configuration failures
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
This allows frr-reload.py (or anything else that scripts via vtysh)
to know if the vtysh command worked or hit an error.
Diffstat (limited to 'ripd/rip_zebra.c')
| -rw-r--r-- | ripd/rip_zebra.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 31204872ac..c2418e1b52 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -349,7 +349,7 @@ DEFUN (rip_redistribute_type, vty_outln (vty, "Invalid type %s",argv[1]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (no_rip_redistribute_type, @@ -375,7 +375,7 @@ DEFUN (no_rip_redistribute_type, vty_outln (vty, "Invalid type %s",argv[2]->arg); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (rip_redistribute_type_routemap, @@ -402,7 +402,7 @@ DEFUN (rip_redistribute_type_routemap, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (no_rip_redistribute_type_routemap, @@ -422,7 +422,7 @@ DEFUN (no_rip_redistribute_type_routemap, if (strmatch (redist_type[i].str, argv[idx_protocol]->text)) { if (rip_routemap_unset (redist_type[i].type,argv[idx_word]->arg)) - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; rip_redistribute_unset (redist_type[i].type); return CMD_SUCCESS; } @@ -430,7 +430,7 @@ DEFUN (no_rip_redistribute_type_routemap, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (rip_redistribute_type_metric, @@ -460,7 +460,7 @@ DEFUN (rip_redistribute_type_metric, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (no_rip_redistribute_type_metric, @@ -480,7 +480,7 @@ DEFUN (no_rip_redistribute_type_metric, if (strmatch (redist_type[i].str, argv[idx_protocol]->text)) { if (rip_metric_unset (redist_type[i].type, atoi(argv[idx_number]->arg))) - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; rip_redistribute_unset (redist_type[i].type); return CMD_SUCCESS; } @@ -488,7 +488,7 @@ DEFUN (no_rip_redistribute_type_metric, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } DEFUN (rip_redistribute_type_metric_routemap, @@ -522,7 +522,7 @@ DEFUN (rip_redistribute_type_metric_routemap, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } @@ -546,11 +546,11 @@ DEFUN (no_rip_redistribute_type_metric_routemap, if (strmatch (redist_type[i].str, argv[idx_protocol]->text)) { if (rip_metric_unset (redist_type[i].type, atoi(argv[idx_number]->arg))) - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; if (rip_routemap_unset (redist_type[i].type, argv[idx_word]->arg)) { rip_redistribute_metric_set(redist_type[i].type, atoi(argv[idx_number]->arg)); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } rip_redistribute_unset (redist_type[i].type); return CMD_SUCCESS; @@ -559,7 +559,7 @@ DEFUN (no_rip_redistribute_type_metric_routemap, vty_outln (vty, "Invalid type %s", argv[idx_protocol]->text); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } /* Default information originate. */ |