proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-31 03:30:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: clean vtysh_file_locked when exiting config node

Browse Source 
The flag should be cleared to make sure it's not reused the next time
we enter the config node.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
(cherry picked from commit 40def43dfa)
This commit is contained in:
Igor Ryzhov 2023-11-16 20:00:07 +01:00 committed by Mergify
parent 5f46d4ac50
commit ae1640befd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtysh/vtysh.c
View File

@ -1652,6 +1652,7 @@ static int vtysh_end(void)
/* Nothing to do. */
break;
default:
vty->vtysh_file_locked = false;
vty->node = ENABLE_NODE;
break;
}
@ -2396,14 +2397,18 @@ static int vtysh_exit(struct vty *vty)
vty->node = cnode->parent_node;
if (vty->node == CONFIG_NODE) {
bool locked = vty->vtysh_file_locked;
/* resync in case one of the daemons is somewhere else */
vtysh_execute("end");
/* NOTE: a rather expensive thing to do, can we avoid it? */
if (vty->vtysh_file_locked)
if (locked)
vtysh_execute("configure terminal file-lock");
else
vtysh_execute("configure terminal");
} else if (vty->node == ENABLE_NODE) {
vty->vtysh_file_locked = false;
}
return CMD_SUCCESS;