diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2021-06-08 17:41:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 17:41:45 +0200 |
| commit | fdb7f5d54f94225b0f70709ef44b06d10b59f535 (patch) | |
| tree | 4765e60df67f2de82f705247859d7beadc1fb288 /lib/command.c | |
| parent | Merge pull request #8796 from idryzhov/ospf-passive (diff) | |
| parent | vtysh: fix searching commands in parent nodes (diff) | |
| download | frr-fdb7f5d54f94225b0f70709ef44b06d10b59f535.tar.xz frr-fdb7f5d54f94225b0f70709ef44b06d10b59f535.zip | |
Merge pull request #8593 from idryzhov/cmd-ambiguous
vtysh: fix searching commands in parent nodes
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/command.c b/lib/command.c index a19d392f3..7be54907e 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1058,6 +1058,7 @@ int cmd_execute_command(vector vline, struct vty *vty, return saved_ret; if (ret != CMD_SUCCESS && ret != CMD_WARNING + && ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE && ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED) { /* This assumes all nodes above CONFIG_NODE are childs of * CONFIG_NODE */ @@ -1071,6 +1072,7 @@ int cmd_execute_command(vector vline, struct vty *vty, ret = cmd_execute_command_real(vline, FILTER_RELAXED, vty, cmd, 0); if (ret == CMD_SUCCESS || ret == CMD_WARNING + || ret == CMD_ERR_AMBIGUOUS || ret == CMD_ERR_INCOMPLETE || ret == CMD_NOT_MY_INSTANCE || ret == CMD_WARNING_CONFIG_FAILED) return ret; @@ -1269,6 +1271,7 @@ int command_config_read_one_line(struct vty *vty, while (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) && ret != CMD_SUCCESS && ret != CMD_WARNING + && ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE && ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED && ret != CMD_NO_LEVEL_UP) ret = cmd_execute_command_real(vline, FILTER_STRICT, vty, cmd, |