From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 17 Jan 2024 15:57:02 +0000 (+0100)
Subject: src/sulogin.c: Make static variables local to main()
X-Git-Tag: 4.15.0-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1faf4d6469ac440e18f049fcee5a5616483e9b80;p=thirdparty%2Fshadow.git

src/sulogin.c: Make static variables local to main()

Those variables are only used in main().  Restrict their scope.
Keep them static (.bss), as changing that may be dangerous.

Suggested-by: Samanta Navarro <ferivoz@riseup.net>
Cc: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/sulogin.c b/src/sulogin.c
index f6bb5f6c9..77f4fdde2 100644
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -37,9 +37,6 @@
  */
 const char *Prog;
 
-static char pass[BUFSIZ];
-
-static struct passwd pwent;
 
 extern char **newenvp;
 extern size_t newenvc;
@@ -58,7 +55,7 @@ static void catch_signals (unused int sig)
 	_exit (1);
 }
 
- /*ARGSUSED*/ int main (int argc, char **argv)
+/*ARGSUSED*/ int main (int argc, char **argv)
 {
 #ifndef USE_PAM
 	const char *env;
@@ -67,6 +64,9 @@ static void catch_signals (unused int sig)
 	TERMIO termio;
 	int err = 0;
 
+	static char           pass[BUFSIZ];
+	static struct passwd  pwent;
+
 	tcgetattr (0, &termio);
 	termio.c_iflag |= (ICRNL | IXON);
 	termio.c_oflag |= (CREAD);