Ahem: add new faq entry to list at top of FAQ.html

[oweals/busybox.git] / loginutils / sulogin.c

diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index a654ffb8932fd6963b82b5f8538f7592cdcdf374..a458b6ed7392830157c67a50b0fa286bb1993e65 100644 (file)
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <termios.h>
 #include <unistd.h>
 #include <utmp.h>
 #include <sys/resource.h>
@@ -55,7 +54,6 @@ extern int sulogin_main(int argc, char **argv)
        const char *name = "root";
        int timeout = 0;
        static char pass[BUFSIZ];
-       struct termios termio;
        struct passwd pwent;
        struct passwd *pwd;
        time_t start, now;
@@ -64,28 +62,6 @@ extern int sulogin_main(int argc, char **argv)
        struct spwd *spwd = NULL;
 #endif                                                 /* CONFIG_FEATURE_SHADOWPASSWDS */
 
-       tcgetattr(0, &termio);
-       /* set control chars */
-       termio.c_cc[VINTR]  = 3;        /* C-c */
-       termio.c_cc[VQUIT]  = 28;       /* C-\ */
-       termio.c_cc[VERASE] = 127; /* C-? */
-       termio.c_cc[VKILL]  = 21;       /* C-u */
-       termio.c_cc[VEOF]   = 4;        /* C-d */
-       termio.c_cc[VSTART] = 17;       /* C-q */
-       termio.c_cc[VSTOP]  = 19;       /* C-s */
-       termio.c_cc[VSUSP]  = 26;       /* C-z */
-       /* use line dicipline 0 */
-       termio.c_line = 0;
-       /* Make it be sane */
-       termio.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
-       termio.c_cflag |= CREAD|HUPCL|CLOCAL;
-       /* input modes */
-       termio.c_iflag = ICRNL | IXON | IXOFF;
-       /* output modes */
-       termio.c_oflag = OPOST | ONLCR;
-       /* local modes */
-       termio.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE | IEXTEN;
-       tcsetattr(0, TCSANOW, &termio);
        openlog("sulogin", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH);
        if (argc > 1) {
                if (strncmp(argv[1], "-t", 2) == 0) {
@@ -117,9 +93,9 @@ extern int sulogin_main(int argc, char **argv)
                        }
                }
        }
-       if (access(passwd_file, 0) == -1) {
+       if (access(bb_path_passwd_file, 0) == -1) {
                syslog(LOG_WARNING, "No password file\n");
-               error_msg_and_die("No password file\n");
+               bb_error_msg_and_die("No password file\n");
        }
        if (!isatty(0) || !isatty(1) || !isatty(2)) {
                exit(EXIT_FAILURE);
@@ -132,10 +108,9 @@ extern int sulogin_main(int argc, char **argv)
 
 
        signal(SIGALRM, catchalarm);
-       alarm(timeout);
        if (!(pwd = getpwnam(name))) {
                syslog(LOG_WARNING, "No password entry for `root'\n");
-               error_msg_and_die("No password entry for `root'\n");
+               bb_error_msg_and_die("No password entry for `root'\n");
        }
        pwent = *pwd;
 #ifdef CONFIG_FEATURE_SHADOWPASSWDS
@@ -150,7 +125,7 @@ extern int sulogin_main(int argc, char **argv)
        }
 #endif                                                 /* CONFIG_FEATURE_SHADOWPASSWDS */
        while (1) {
-               cp = getpass(SULOGIN_PROMPT);
+               cp = bb_askpass(timeout, SULOGIN_PROMPT);
                if (!cp || !*cp) {
                        puts("\n");
                        fflush(stdout);
@@ -174,11 +149,16 @@ extern int sulogin_main(int argc, char **argv)
                syslog(LOG_WARNING, "Incorrect root password\n");
        }
        bzero(pass, strlen(pass));
-       alarm(0);
        signal(SIGALRM, SIG_DFL);
        puts("Entering System Maintenance Mode\n");
        fflush(stdout);
        syslog(LOG_INFO, "System Maintenance Mode\n");
+
+#ifdef CONFIG_SELINUX
+       renew_current_security_context();
+#endif
+
        run_shell(pwent.pw_shell, 1, 0, 0);
+
        return (0);
 }