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>

diff --git a/lib/command.c b/lib/command.c
index 3761f444bca5e81dc823b85ef18708c5ecce858c..0fa6bde3345262ecff39774896ae304c6775a793 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -1961,10 +1961,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);
@@ -1973,10 +1970,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;
@@ -2049,10 +2043,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);
@@ -2061,10 +2052,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 9ba53e0907441176c639024b7c73ccc06c51fda2..8d9c39b0ea05ec9805d656e69b7e0b1b7c86c624 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 8403912ea321a24fb424a96da3ac69e4cccba4f1..9fff2ee58c4ee90091030551926c6112577b33cf 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;
 }