date and time created 87/12/12 17:14:19 by bostic

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

diff --git a/usr/src/usr.bin/passwd/passwd.c b/usr/src/usr.bin/passwd/passwd.c
index 0c7057c..9e4865c 100644 (file)
--- a/usr/src/usr.bin/passwd/passwd.c
+++ b/usr/src/usr.bin/passwd/passwd.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)passwd.c   4.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)passwd.c   4.30 (Berkeley) %G%";

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


@@ -276,10 +276,14 @@ getnewpasswd(pwd, u)
                }
                else if (++insist == 4)
                        break;
                }
                else if (++insist == 4)
                        break;

-               if (checkpass(pwbuf))
+               if (strlen(pwbuf) <= 4)
+                       puts("Please enter a longer password.");
+               else for (pw = pwbuf; *pw && islower(*pw); ++pw);
+               if (*pw)

                        break;
                        break;

+               puts("Please don't use an all-lower case password.\nUnusual capitalization, control characters or digits are suggested.");

        }
        }

-       if (strcmp(pwbuf, getpass("Retype new password:")) != 0) {
+       if (strcmp(pwbuf, getpass("Retype new password:"))) {

                puts("Mismatch - password unchanged.");
                exit(1);
        }
                puts("Mismatch - password unchanged.");
                exit(1);
        }