commit f3ba8abc97a492c4365149fa150460d37d076d85
author Diego Elio Pettenò <flameeyes@flameeyes.eu> Fri Jun 29 13:01:28 2012 -0700
committer Harald Welte <laforge@gnumonks.org> Sat Jun 30 22:01:44 2012 +0200
tree 76c0a304182da95ff415f7e5f22c0a080cf4efcd
parent 23431c75c8cc5df8712834e59dd80bd19b5fc298

vty: avoid using a .data variable.

no_password_check was the only initialized, non-relocated data in the
set of libraries, inverting its logic let us keep it in .bss
(non-initialized data, which is mapped to the zero page).

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>

src/vty/vty.c

diff --git a/src/vty/vty.c b/src/vty/vty.c
index 28c2266..67ee100 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -78,7 +78,7 @@
 /* Configure lock. */
 static int vty_config;
 
-static int no_password_check = 1;
+static int password_check;
 
 void *tall_vty_ctx;
 
@@ -1492,7 +1492,7 @@
   vty->fd = vty_sock;
   vty->priv = priv;
   vty->type = VTY_TERM;
-  if (no_password_check)
+  if (!password_check)
     {
       if (host.advanced)
 	vty->node = ENABLE_NODE;
@@ -1515,7 +1515,7 @@
   else
     vty->lines = -1;
 
-  if (! no_password_check)
+  if (password_check)
     {
       /* Vty is not available if password isn't set. */
       if (host.password == NULL && host.password_encrypt == NULL)
@@ -1529,7 +1529,7 @@
 
   /* Say hello to the world. */
   vty_hello (vty);
-  if (! no_password_check)
+  if (password_check)
     vty_out (vty, "%sUser Access Verification%s%s", VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
 
   /* Setting up terminal. */
@@ -1573,14 +1573,14 @@
 /* vty login. */
 DEFUN(vty_login, vty_login_cmd, "login", "Enable password checking\n")
 {
-	no_password_check = 0;
+	password_check = 1;
 	return CMD_SUCCESS;
 }
 
 DEFUN(no_vty_login,
       no_vty_login_cmd, "no login", NO_STR "Enable password checking\n")
 {
-	no_password_check = 1;
+	password_check = 0;
 	return CMD_SUCCESS;
 }
 
@@ -1650,7 +1650,7 @@
 	vty_out(vty, "line vty%s", VTY_NEWLINE);
 
 	/* login */
-	if (no_password_check)
+	if (password_check)
 		vty_out(vty, " no login%s", VTY_NEWLINE);
 
 	vty_out(vty, "!%s", VTY_NEWLINE);