Revert "vtysh: fix searching commands in parent nodes"

This reverts commit d741915ecdcf8930ccb3bd23eec1da2f0d000483.

This is because it breaks this behavior:

router ospf6
  <commands>
!
int enp39s0
  <more commands>
!

This is a very legal set of commands and completely destroys the
ability to do this.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/lib/command.c b/lib/command.c
index 38a7b3fe7cf559768fcb879d0a629694717e2ada..d8a2270bc5325e0acc450097191a8abbb20ca104 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -967,7 +967,6 @@ 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 */
@@ -979,7 +978,6 @@ int cmd_execute_command(vector vline, struct vty *vty,
                        ret = cmd_execute_command_real(vline, FILTER_RELAXED,
                                                       vty, cmd);
                        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;
@@ -1164,7 +1162,6 @@ int command_config_read_one_line(struct vty *vty,
        if (!(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
            && vty->node != CONFIG_NODE) {
                int saved_node = vty->node;
@@ -1173,7 +1170,6 @@ 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
                       && vty->node > CONFIG_NODE) {
                        vty->node = node_parent(vty->node);
                        if (vty->xpath_index > 0)

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 2ef034765104a93285bfde295ba66dbd25407d38..15ec866fc91e95699f2f1f61b1dcbba8669d04a2 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -492,7 +492,6 @@ static int vtysh_execute_func(const char *line, int pager)
         */
        while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON
               && ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED
-              && ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
               && vty->node > CONFIG_NODE) {
                vty->node = node_parent(vty->node);
                ret = cmd_execute(vty, line, &cmd, 1);
@@ -778,7 +777,6 @@ int vtysh_mark_file(const char *filename)
                 */
                while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON
                       && ret != CMD_WARNING && ret != CMD_WARNING_CONFIG_FAILED
-                      && ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE
                       && vty->node > CONFIG_NODE) {
                        vty->node = node_parent(vty->node);
                        ret = cmd_execute_command_strict(vline, vty, &cmd);