diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-11-30 18:50:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 18:50:49 -0500 |
| commit | 0ee78eafbd65268d0ccda1aa04eecff9664a6420 (patch) | |
| tree | 22b65585ede915baa416f4274e8e7d13c1e662e5 /lib/command.c | |
| parent | 1b982ea43031fbbdab45faf0c132590144c28f6d (diff) | |
| parent | f344c66ea358c151a218e986173e60bb0295e003 (diff) | |
Merge pull request #3378 from opensourcerouting/remove-config-lock
*: remove the configuration lock from all daemons
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/command.c b/lib/command.c index a01aabcc2a..d1dafa3a1a 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1391,19 +1391,7 @@ DEFUN (config_terminal, "Configuration from vty interface\n" "Configuration terminal\n") { - if (vty_config_lock(vty)) - vty->node = CONFIG_NODE; - else { - vty_out(vty, "VTY configuration is locked by other VTY\n"); - return CMD_WARNING_CONFIG_FAILED; - } - - vty->private_config = false; - vty->candidate_config = vty_shared_candidate_config; - if (frr_get_cli_mode() == FRR_CLI_TRANSACTIONAL) - vty->candidate_config_base = nb_config_dup(running_config); - - return CMD_SUCCESS; + return vty_config_enter(vty, false, false); } /* Enable command */ @@ -1455,7 +1443,7 @@ void cmd_exit(struct vty *vty) break; case CONFIG_NODE: vty->node = ENABLE_NODE; - vty_config_unlock(vty); + vty_config_exit(vty); break; case INTERFACE_NODE: case PW_NODE: @@ -1599,7 +1587,7 @@ DEFUN (config_end, case LINK_PARAMS_NODE: case BFD_NODE: case BFD_PEER_NODE: - vty_config_unlock(vty); + vty_config_exit(vty); vty->node = ENABLE_NODE; break; default: |