tcpudp: trivial build fix

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

diff --git a/loginutils/login.c b/loginutils/login.c
index bc437bb6b7d6c7da2554b745833bf448921b4042..e8fe74e164d4cfaf1348a371ef4d85d19d026d32 100644 (file)
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -114,7 +114,7 @@ static void write_utent(struct utmp *utptr, const char *username)
 #endif /* !ENABLE_FEATURE_UTMP */
 
 #if ENABLE_FEATURE_NOLOGIN
-static void die_if_nologin_and_non_root(int amroot)
+static void die_if_nologin(void)
 {
        FILE *fp;
        int c;
@@ -130,12 +130,10 @@ static void die_if_nologin_and_non_root(int amroot)
                fclose(fp);
        } else
                puts("\r\nSystem closed for routine maintenance\r");
-       if (!amroot)
-               exit(1);
-       puts("\r\n[Disconnect bypassed -- root login allowed]\r");
+       exit(1);
 }
 #else
-static ALWAYS_INLINE void die_if_nologin_and_non_root(int amroot) {}
+static ALWAYS_INLINE void die_if_nologin(void) {}
 #endif
 
 #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
@@ -223,7 +221,7 @@ static void alarm_handler(int sig ATTRIBUTE_UNUSED)
 }
 
 int login_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int login_main(int argc, char **argv)
+int login_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
        enum {
                LOGIN_OPT_f = (1<<0),
@@ -237,8 +235,8 @@ int login_main(int argc, char **argv)
        unsigned opt;
        int count = 0;
        struct passwd *pw;
-       char *opt_host = NULL;
-       char *opt_user = NULL;
+       char *opt_host = opt_host; /* for compiler */
+       char *opt_user = opt_user; /* for compiler */
        char full_tty[TTYNAME_SIZE];
        USE_SELINUX(security_context_t user_sid = NULL;)
        USE_FEATURE_UTMP(struct utmp utent;)
@@ -271,8 +269,9 @@ int login_main(int argc, char **argv)
                        bb_error_msg_and_die("-f is for root only");
                safe_strncpy(username, opt_user, sizeof(username));
        }
-       if (optind < argc) /* user from command line (getty) */
-               safe_strncpy(username, argv[optind], sizeof(username));
+       argv += optind;
+       if (argv[0]) /* user from command line (getty) */
+               safe_strncpy(username, argv[0], sizeof(username));
 
        /* Let's find out and memorize our tty */
        if (!isatty(0) || !isatty(1) || !isatty(2))
@@ -287,7 +286,7 @@ int login_main(int argc, char **argv)
 
        read_or_build_utent(&utent, !amroot);
 
-       if (opt_host) {
+       if (opt & LOGIN_OPT_h) {
                USE_FEATURE_UTMP(
                        safe_strncpy(utent.ut_host, opt_host, sizeof(utent.ut_host));
                )
@@ -406,7 +405,8 @@ int login_main(int argc, char **argv)
        }
 
        alarm(0);
-       die_if_nologin_and_non_root(pw->pw_uid == 0);
+       if (!amroot)
+               die_if_nologin();
 
        write_utent(&utent, username);
 
@@ -450,9 +450,12 @@ int login_main(int argc, char **argv)
                        xsetenv("LOGIN_UID", utoa(pw->pw_uid));
                        xsetenv("LOGIN_GID", utoa(pw->pw_gid));
                        xsetenv("LOGIN_SHELL", pw->pw_shell);
-                       xspawn(t_argv); /* NOMMU-friendly */
-                       /* All variables are unset by setup_environment */
-                       wait(NULL);
+                       spawn_and_wait(t_argv); /* NOMMU-friendly */
+                       unsetenv("LOGIN_TTY"  );
+                       unsetenv("LOGIN_USER" );
+                       unsetenv("LOGIN_UID"  );
+                       unsetenv("LOGIN_GID"  );
+                       unsetenv("LOGIN_SHELL");
                }
        }
 
@@ -460,9 +463,8 @@ int login_main(int argc, char **argv)
        tmp = pw->pw_shell;
        if (!tmp || !*tmp)
                tmp = DEFAULT_SHELL;
-       /* setup_environment params: shell, loginshell, changeenv, pw */
-       setup_environment(tmp, 1, !(opt & LOGIN_OPT_p), pw);
-       /* FIXME: login shell = 1 -> 3rd parameter is ignored! */
+       /* setup_environment params: shell, clear_env, change_env, pw */
+       setup_environment(tmp, !(opt & LOGIN_OPT_p), 1, pw);
 
        motd();