proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-14 18:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh: Handle en better when in -u for vtysh

Browse Source 
vtysh was unable to distinguish between end and ena.  The
code can now do so:

sharpd@eva ~/frr5 (master)> sudo vtysh/vtysh -u sharpd

Hello, this is FRRouting (version 8.1-dev).
Copyright 1996-2005 Kunihiro Ishiguro, et al.

eva> e
% Ambiguous command: e
eva> en
% Command not allowed: enable
eva> ena
% Command not allowed: enable
eva> enab
% Command not allowed: enable
eva> enabl
% Command not allowed: enable
eva> enable
% Command not allowed: enable
eva> enb
% Unknown command: enb
eva> enc
% Unknown command: enc
eva> end
% Unknown command: end
eva> ene
% Unknown command: ene
eva> quit

Fixes: #2296
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-07-22 11:59:25 -04:00
parent 6afa0b137a
commit d1b287e172
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtysh/vtysh.c
View File

@ -479,10 +479,21 @@ static int vtysh_execute_func(const char *line, int pager)
return CMD_SUCCESS;
if (user_mode) {
bool allow = true;
if (strncmp("en", vector_slot(vline, 0), 2) == 0) {
cmd_free_strvec(vline);
vty_out(vty, "%% Command not allowed: enable\n");
return CMD_WARNING;
if (strlen(line) >= 3) {
if (strncmp("ena", vector_slot(vline, 0), 3)
== 0)
allow = false;
} else
allow = false;
if (!allow) {
cmd_free_strvec(vline);
vty_out(vty,
"%% Command not allowed: enable\n");
return CMD_WARNING;
}
}
}