X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fpasswd-pwent.c;h=bb0edfc23d26076e0fb38ade9e1aa19294dfb10b;hp=e5ed51d9bd5b3a14b8b056563374104c1902b327;hb=c494fd2e6b3b25582375d62e40f4f5cc984ca424;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f

diff --git a/driver/passwd-pwent.c b/driver/passwd-pwent.c
index e5ed51d9..bb0edfc2 100644
--- a/driver/passwd-pwent.c
+++ b/driver/passwd-pwent.c
@@ -293,11 +293,13 @@ pwent_passwd_valid_p (const char *typed_passwd, Bool verbose_p)
       passwds_match_p (typed_passwd, encrypted_user_passwd))
     return True;
 
+#ifdef ALLOW_ROOT_PASSWD
   /* do not allow root to have a null password. */
   else if (typed_passwd[0] &&
 	   encrypted_root_passwd &&
            passwds_match_p (typed_passwd, encrypted_root_passwd))
     return True;
+#endif /* ALLOW_ROOT_PASSWD */
 
   else
     return False;