lib: Moved no-password warnings into header file

The warning string which appears when the users executes 'no (enable)
password' was moved into command.h and declared as a constant named
'NO_PASSWD_CMD_WARNING'.

This avoids duplicate code and makes it easy to change the warning
message in all places at once.

Signed-off-by: Pascal Mathis <mail@pascalmathis.com>
(cherry picked from commit 4911ca9cab5d75b5031edb83b52423ed47798324)

diff --git a/lib/command.c b/lib/command.c
index e06db4deeea4116242f1793957106aeff06af42d..dc50193f60664a267ed88af0c1b3ef96bf040d6e 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -1945,10 +1945,7 @@ DEFUN (no_config_password,
 
        if (host.password) {
                if (!vty_shell_serv(vty)) {
-                       vty_out(vty,
-                               "Please be aware that removing the password is "
-                               "a security risk and you should think twice "
-                               "about this command\n");
+                       vty_out(vty, NO_PASSWD_CMD_WARNING);
                        warned = true;
                }
                XFREE(MTYPE_HOST, host.password);
@@ -1957,10 +1954,7 @@ DEFUN (no_config_password,
 
        if (host.password_encrypt) {
                if (!warned && !vty_shell_serv(vty))
-                       vty_out(vty,
-                               "Please be aware that removing the password is "
-                               "a security risk and you should think twice "
-                               "about this command\n");
+                       vty_out(vty, NO_PASSWD_CMD_WARNING);
                XFREE(MTYPE_HOST, host.password_encrypt);
        }
        host.password_encrypt = NULL;
@@ -2033,10 +2027,7 @@ DEFUN (no_config_enable_password,
 
        if (host.enable) {
                if (!vty_shell_serv(vty)) {
-                       vty_out(vty,
-                               "Please be aware that removing the password is "
-                               "a security risk and you should think twice "
-                               "about this command\n");
+                       vty_out(vty, NO_PASSWD_CMD_WARNING);
                        warned = true;
                }
                XFREE(MTYPE_HOST, host.enable);
@@ -2045,10 +2036,7 @@ DEFUN (no_config_enable_password,
 
        if (host.enable_encrypt) {
                if (!warned && !vty_shell_serv(vty))
-                       vty_out(vty,
-                               "Please be aware that removing the password is "
-                               "a security risk and you should think twice "
-                               "about this command\n");
+                       vty_out(vty, NO_PASSWD_CMD_WARNING);
                XFREE(MTYPE_HOST, host.enable_encrypt);
        }
        host.enable_encrypt = NULL;

diff --git a/lib/command.h b/lib/command.h
index f18de3417cae810bbe0df47f87d7614cf025bd42..26e8fc7e1198cad8b4eea2bf26b3bcd52cbbc1b3 100644 (file)
--- a/lib/command.h
+++ b/lib/command.h
@@ -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"

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 84b28b18b5703f41ff3a6145fd1d27115d6c9880..4182ca50ab40534eb128c223498f0bef0389df09 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2372,9 +2372,7 @@ DEFUNSH(VTYSH_ALL, no_vtysh_config_password, no_vtysh_password_cmd,
        "no password", NO_STR
        "Modify the terminal connection password\n")
 {
-       vty_out(vty,
-               "Please be aware that removing the password is a security risk "
-               "and you should think twice about this command\n");
+       vty_out(vty, NO_PASSWD_CMD_WARNING);
 
        return CMD_SUCCESS;
 }
@@ -2394,9 +2392,7 @@ DEFUNSH(VTYSH_ALL, no_vtysh_config_enable_password,
        "Modify enable password parameters\n"
        "Assign the privileged level password\n")
 {
-       vty_out(vty,
-               "Please be aware that removing the password is a security risk "
-               "and you should think twice about this command\n");
+       vty_out(vty, NO_PASSWD_CMD_WARNING);
 
        return CMD_SUCCESS;
 }