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_interface.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_interface.c')
| -rw-r--r-- | ripngd/ripng_interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |