From e5387a0574a4da88411753c4df959a03629063c9 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 20 Oct 2007 19:20:22 +0000 Subject: bb_askpass: handle Ctrl-C, restore termoios on Ctrl-C. sulogin: remove alarm handling, as it is redundant there. code shrink. After all differences cancel out: text data bss dec hex filename 777543 1000 9532 788075 c066b busybox_old 777543 1000 9532 788075 c066b busybox_unstripped --- loginutils/sulogin.c | 61 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'loginutils') diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index 7f100a162..f633fbbf1 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -9,29 +9,26 @@ #include "libbb.h" -static const char *const forbid[] = { - "ENV", - "BASH_ENV", - "HOME", - "IFS", - "PATH", - "SHELL", - "LD_LIBRARY_PATH", - "LD_PRELOAD", - "LD_TRACE_LOADED_OBJECTS", - "LD_BIND_NOW", - "LD_AOUT_LIBRARY_PATH", - "LD_AOUT_PRELOAD", - "LD_NOWARN", - "LD_KEEPDIR", - (char *) 0 -}; - - -static void catchalarm(int ATTRIBUTE_UNUSED junk) -{ - exit(EXIT_FAILURE); -} +static const char forbid[] ALIGN1 = + "ENV" "\0" + "BASH_ENV" "\0" + "HOME" "\0" + "IFS" "\0" + "PATH" "\0" + "SHELL" "\0" + "LD_LIBRARY_PATH" "\0" + "LD_PRELOAD" "\0" + "LD_TRACE_LOADED_OBJECTS" "\0" + "LD_BIND_NOW" "\0" + "LD_AOUT_LIBRARY_PATH" "\0" + "LD_AOUT_PRELOAD" "\0" + "LD_NOWARN" "\0" + "LD_KEEPDIR" "\0"; + +//static void catchalarm(int ATTRIBUTE_UNUSED junk) +//{ +// exit(EXIT_FAILURE); +//} int sulogin_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -40,7 +37,7 @@ int sulogin_main(int argc, char **argv) char *cp; int timeout = 0; char *timeout_arg; - const char *const *p; + const char *p; struct passwd *pwd; const char *shell; #if ENABLE_FEATURE_SHADOWPASSWDS @@ -71,10 +68,14 @@ int sulogin_main(int argc, char **argv) } /* Clear out anything dangerous from the environment */ - for (p = forbid; *p; p++) - unsetenv(*p); + p = forbid; + do { + unsetenv(p); + p += strlen(p) + 1; + } while (*p); - signal(SIGALRM, catchalarm); +// bb_askpass() already handles this +// signal(SIGALRM, catchalarm); pwd = getpwuid(0); if (!pwd) { @@ -105,7 +106,7 @@ int sulogin_main(int argc, char **argv) bb_error_msg("login incorrect"); } memset(cp, 0, strlen(cp)); - signal(SIGALRM, SIG_DFL); +// signal(SIGALRM, SIG_DFL); bb_info_msg("System Maintenance Mode"); @@ -122,6 +123,6 @@ int sulogin_main(int argc, char **argv) /* Exec login shell with no additional parameters. Never returns. */ run_shell(shell, 1, NULL, NULL); -auth_error: - bb_error_msg_and_die("no password entry for 'root'"); + auth_error: + bb_error_msg_and_die("no password entry for root"); } -- cgit v1.2.3