don't show nologin stuff until have a valid password

[unix-history] / usr / src / usr.bin / login / login.c

diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c
index f4d6a97..10eb949 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)login.c    5.58 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c    5.59 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -244,10 +244,6 @@ main(argc, argv)
                else
                        salt = "xx";
 
                else
                        salt = "xx";
 

-               /* if user not super-user, check for disabled logins */
-               if (!pwd || pwd->pw_uid)
-                       checknologin();
-

                /*
                 * Disallow automatic login to root; if not invoked by
                 * root, disallow if the uid's differ.
                /*
                 * Disallow automatic login to root; if not invoked by
                 * root, disallow if the uid's differ.


@@ -317,6 +313,10 @@ main(argc, argv)
        /* paranoia... */
        endpwent();
 
        /* paranoia... */
        endpwent();
 

+       /* if user not super-user, check for disabled logins */
+       if (pwd->pw_uid)
+               checknologin();
+

        if (chdir(pwd->pw_dir) < 0) {
                (void)printf("No directory %s!\n", pwd->pw_dir);
                if (chdir("/"))
        if (chdir(pwd->pw_dir) < 0) {
                (void)printf("No directory %s!\n", pwd->pw_dir);
                if (chdir("/"))