mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-25 18:00:25 +00:00
Merge pull request #2223 from ppmathis/fix/no-password-warnings
lib: Improved warnings for 'no (enable) password'
This commit is contained in:
commit
62362d70aa
@ -1960,19 +1960,17 @@ DEFUN (no_config_password,
|
||||
bool warned = false;
|
||||
|
||||
if (host.password) {
|
||||
vty_out(vty,
|
||||
"Please be aware that removing the password is a security risk and "
|
||||
"you should think twice about this command\n");
|
||||
if (!vty_shell_serv(vty)) {
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
warned = true;
|
||||
}
|
||||
XFREE(MTYPE_HOST, host.password);
|
||||
}
|
||||
host.password = NULL;
|
||||
|
||||
if (host.password_encrypt) {
|
||||
if (!warned)
|
||||
vty_out(vty,
|
||||
"Please be aware that removing the password is a security risk "
|
||||
"and you should think twice about this command\n");
|
||||
if (!warned && !vty_shell_serv(vty))
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
XFREE(MTYPE_HOST, host.password_encrypt);
|
||||
}
|
||||
host.password_encrypt = NULL;
|
||||
@ -2044,19 +2042,17 @@ DEFUN (no_config_enable_password,
|
||||
bool warned = false;
|
||||
|
||||
if (host.enable) {
|
||||
vty_out(vty,
|
||||
"Please be aware that removing the password is a security risk and "
|
||||
"you should think twice about this command\n");
|
||||
if (!vty_shell_serv(vty)) {
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
warned = true;
|
||||
}
|
||||
XFREE(MTYPE_HOST, host.enable);
|
||||
}
|
||||
host.enable = NULL;
|
||||
|
||||
if (host.enable_encrypt) {
|
||||
if (!warned)
|
||||
vty_out(vty,
|
||||
"Please be aware that removing the password is a security risk "
|
||||
"and you should think twice about this command\n");
|
||||
if (!warned && !vty_shell_serv(vty))
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
XFREE(MTYPE_HOST, host.enable_encrypt);
|
||||
}
|
||||
host.enable_encrypt = NULL;
|
||||
|
@ -376,6 +376,10 @@ struct cmd_node {
|
||||
|
||||
#define CONF_BACKUP_EXT ".sav"
|
||||
|
||||
/* Command warnings. */
|
||||
#define NO_PASSWD_CMD_WARNING \
|
||||
"Please be aware that removing the password is a security risk and you should think twice about this command.\n"
|
||||
|
||||
/* IPv4 only machine should not accept IPv6 address for peer's IP
|
||||
address. So we replace VTY command string like below. */
|
||||
#define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n"
|
||||
|
@ -2372,6 +2372,8 @@ DEFUNSH(VTYSH_ALL, no_vtysh_config_password, no_vtysh_password_cmd,
|
||||
"no password", NO_STR
|
||||
"Modify the terminal connection password\n")
|
||||
{
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
@ -2390,6 +2392,8 @@ DEFUNSH(VTYSH_ALL, no_vtysh_config_enable_password,
|
||||
"Modify enable password parameters\n"
|
||||
"Assign the privileged level password\n")
|
||||
{
|
||||
vty_out(vty, NO_PASSWD_CMD_WARNING);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user