diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2024-04-16 22:10:45 +0300 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2024-04-16 22:18:01 +0300 |
| commit | 57811a53ba65f755cb2ff9cdc682b8a249144ffa (patch) | |
| tree | bbd5bcdbb733bac37dce329a442658fc88e0bbcc | |
| parent | 84d1fb19e22a5f0d13d3bbb7c74e9948773e66f3 (diff) | |
lib, zebra: fix exit commands
If a command is not marked as `YANG`-converted, the current command
batching buffer is flushed before executing the command. We shouldn't
flush the buffer when executing an `exit` command. It should only be
flushed if the next command is not `YANG`-converted, which is checked by
the command itself, not the previous `exit`.
Fixes #15706.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
| -rw-r--r-- | lib/command.c | 2 | ||||
| -rw-r--r-- | lib/vrf.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_cli.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/command.c b/lib/command.c index 0288ab7599..51f2529e3e 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1374,7 +1374,7 @@ DEFUN (disable, } /* Down vty node level. */ -DEFUN (config_exit, +DEFUN_YANG (config_exit, config_exit_cmd, "exit", "Exit current mode and down to previous mode\n") @@ -636,7 +636,7 @@ int vrf_configure_backend(enum vrf_backend_type backend) } /* vrf CLI commands */ -DEFUN_NOSH(vrf_exit, +DEFUN_YANG_NOSH (vrf_exit, vrf_exit_cmd, "exit-vrf", "Exit current mode and down to previous mode\n") diff --git a/zebra/zebra_cli.c b/zebra/zebra_cli.c index 00e0a49cb8..3e03d74775 100644 --- a/zebra/zebra_cli.c +++ b/zebra/zebra_cli.c @@ -241,7 +241,7 @@ DEFUN_YANG_NOSH (link_params, return ret; } -DEFUN_NOSH (exit_link_params, +DEFUN_YANG_NOSH (exit_link_params, exit_link_params_cmd, "exit-link-params", "Exit from Link Params configuration mode\n") |