emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sulogin: minor cleanup.

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-09 14:00:58 +00:00
parent 8fafacd7ec
commit 9852d5a1e6
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
loginutils/sulogin.c
View File

@ -9,10 +9,6 @@
#include "busybox.h" #include "busybox.h"
#define SULOGIN_PROMPT "Give root password for system maintenance\n" \
"(or type Control-D for normal startup):"
static const char * const forbid[] = { static const char * const forbid[] = {
"ENV", "ENV",
"BASH_ENV", "BASH_ENV",
@ -32,7 +28,6 @@ static const char * const forbid[] = {
}; };
static void catchalarm(int ATTRIBUTE_UNUSED junk) static void catchalarm(int ATTRIBUTE_UNUSED junk)
{ {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -48,10 +43,8 @@ int sulogin_main(int argc, char **argv)
struct passwd *pwd; struct passwd *pwd;
struct spwd *spwd; struct spwd *spwd;
if (ENABLE_FEATURE_SYSLOG) { logmode = LOGMODE_BOTH;
logmode = LOGMODE_BOTH; openlog(bb_applet_name, 0, LOG_AUTH);
openlog(bb_applet_name, LOG_CONS | LOG_NOWAIT, LOG_AUTH);
}
if (bb_getopt_ulflags (argc, argv, "t:", &timeout_arg)) { if (bb_getopt_ulflags (argc, argv, "t:", &timeout_arg)) {
if (safe_strtoi(timeout_arg, &timeout)) { if (safe_strtoi(timeout_arg, &timeout)) {
@ -68,7 +61,8 @@ int sulogin_main(int argc, char **argv)
} }
if (!isatty(0) || !isatty(1) || !isatty(2)) { if (!isatty(0) || !isatty(1) || !isatty(2)) {
bb_error_msg_and_die("Not a tty"); logmode = LOGMODE_SYSLOG;
bb_error_msg_and_die("not a tty");
} }
/* Clear out anything dangerous from the environment */ /* Clear out anything dangerous from the environment */
@ -78,28 +72,31 @@ int sulogin_main(int argc, char **argv)
signal(SIGALRM, catchalarm); signal(SIGALRM, catchalarm);
if (!(pwd = getpwuid(0))) { if (!(pwd = getpwuid(0))) {
goto AUTH_ERROR; goto auth_error;
} }
if (ENABLE_FEATURE_SHADOWPASSWDS) { if (ENABLE_FEATURE_SHADOWPASSWDS) {
if (!(spwd = getspnam(pwd->pw_name))) { if (!(spwd = getspnam(pwd->pw_name))) {
goto AUTH_ERROR; goto auth_error;
} }
pwd->pw_passwd = spwd->sp_pwdp; pwd->pw_passwd = spwd->sp_pwdp;
} }
while (1) { while (1) {
/* cp points to a static buffer that is zeroed every time */ /* cp points to a static buffer that is zeroed every time */
cp = bb_askpass(timeout, SULOGIN_PROMPT); cp = bb_askpass(timeout,
"Give root password for system maintenance\n"
"(or type Control-D for normal startup):");
if (!cp || !*cp) { if (!cp || !*cp) {
bb_info_msg("Normal startup"); bb_info_msg("Normal startup");
exit(EXIT_SUCCESS); return 0;
} }
if (strcmp(pw_encrypt(cp, pwd->pw_passwd), pwd->pw_passwd) == 0) { if (strcmp(pw_encrypt(cp, pwd->pw_passwd), pwd->pw_passwd) == 0) {
break; break;
} }
bb_do_delay(FAIL_DELAY); bb_do_delay(FAIL_DELAY);
bb_error_msg("Login incorrect"); bb_error_msg("login incorrect");
} }
memset(cp, 0, strlen(cp)); memset(cp, 0, strlen(cp));
signal(SIGALRM, SIG_DFL); signal(SIGALRM, SIG_DFL);
@ -110,6 +107,7 @@ int sulogin_main(int argc, char **argv)
run_shell(pwd->pw_shell, 1, 0, 0); run_shell(pwd->pw_shell, 1, 0, 0);
/* never returns */ /* never returns */
AUTH_ERROR:
bb_error_msg_and_die("No password entry for `root'"); auth_error:
bb_error_msg_and_die("no password entry for `root'");
} }