1 files changed, 5 insertions, 3 deletions

diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 747643159c0e..62f26edda324 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -350,9 +350,11 @@ main(argc, argv)
 				/* already authenticated */
 				break;
 			} else if (pwd->pw_passwd[0] == '\0') {
-				/* pretend password okay */
-				rval = 0;
-				goto ttycheck;
+				if (rootlogin && !rootok) {
+					/* pretend password okay */
+					rval = 0;
+					goto ttycheck;
+				}
 			}
 		}