diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
| commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
| tree | f9a559f654e7d704ecacc9dadedbe01868615610 /ripngd/ripng_zebra.c | |
| parent | *: remove VTYNL, part 6 of 6 (diff) | |
| parent | Merge pull request #815 from dwalton76/CMD_WARNING_take2 (diff) | |
| download | frr-2d8270596a085e7a815cebaea21e17cba9e26111.tar.xz frr-2d8270596a085e7a815cebaea21e17cba9e26111.zip | |
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>
Diffstat (limited to 'ripngd/ripng_zebra.c')
| -rw-r--r-- | ripngd/ripng_zebra.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |