const char * const *p;
struct passwd *pwd;
struct spwd *spwd;
+ const char *shell;
logmode = LOGMODE_BOTH;
- openlog(bb_applet_name, 0, LOG_AUTH);
+ openlog(applet_name, 0, LOG_AUTH);
- if (bb_getopt_ulflags (argc, argv, "t:", &timeout_arg)) {
- if (safe_strtoi(timeout_arg, &timeout)) {
- timeout = 0;
- }
+ if (getopt32(argc, argv, "t:", &timeout_arg)) {
+ timeout = xatoi_u(timeout_arg);
}
if (argv[optind]) {
close(0);
close(1);
- close(2);
dup(xopen(argv[optind], O_RDWR));
+ close(2);
dup(0);
}
signal(SIGALRM, catchalarm);
- if (!(pwd = getpwuid(0))) {
+ pwd = getpwuid(0);
+ if (!pwd) {
goto auth_error;
- }
+ }
if (ENABLE_FEATURE_SHADOWPASSWDS) {
- if (!(spwd = getspnam(pwd->pw_name))) {
+ spwd = getspnam(pwd->pw_name);
+ if (!spwd) {
goto auth_error;
}
pwd->pw_passwd = spwd->sp_pwdp;
USE_SELINUX(renew_current_security_context());
- run_shell(pwd->pw_shell, 1, 0, 0);
+ shell = getenv("SUSHELL");
+ if (!shell) shell = getenv("sushell");
+ if (!shell) {
+ shell = "/bin/sh";
+ if (pwd->pw_shell[0])
+ shell = pwd->pw_shell;
+ }
+ run_shell(shell, 1, 0, 0);
/* 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'");
}