BSD 4_4 release

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

diff --git a/usr/src/usr.bin/passwd/local_passwd.c b/usr/src/usr.bin/passwd/local_passwd.c
index acb8447..a38e1a0 100644 (file)
--- a/usr/src/usr.bin/passwd/local_passwd.c
+++ b/usr/src/usr.bin/passwd/local_passwd.c
@@ -1,12 +1,38 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)local_passwd.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)local_passwd.c     8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -61,22 +87,22 @@ getnewpasswd(pw)
 {
        register char *p, *t;
        int tries;
 {
        register char *p, *t;
        int tries;

-       char buf[_PASSWORD_LEN+1], salt[2], *crypt(), *getpass();
+       char buf[_PASSWORD_LEN+1], salt[9], *crypt(), *getpass();

 
        (void)printf("Changing local password for %s.\n", pw->pw_name);
 
 
        (void)printf("Changing local password for %s.\n", pw->pw_name);
 

-       if (uid && pw->pw_passwd &&
+       if (uid && pw->pw_passwd[0] &&

            strcmp(crypt(getpass("Old password:"), pw->pw_passwd),
            pw->pw_passwd)) {
                errno = EACCES;
            strcmp(crypt(getpass("Old password:"), pw->pw_passwd),
            pw->pw_passwd)) {
                errno = EACCES;

-               pw_error(tempname, 1, 1);
+               pw_error(NULL, 1, 1);

        }
 
        for (buf[0] = '\0', tries = 0;;) {
                p = getpass("New password:");
                if (!*p) {
                        (void)printf("Password unchanged.\n");
        }
 
        for (buf[0] = '\0', tries = 0;;) {
                p = getpass("New password:");
                if (!*p) {
                        (void)printf("Password unchanged.\n");

-                       pw_error((char *)NULL, 0, 0);
+                       pw_error(NULL, 0, 0);

                }
                if (strlen(p) <= 5 && (uid != 0 || ++tries < 2)) {
                        (void)printf("Please enter a longer password.\n");
                }
                if (strlen(p) <= 5 && (uid != 0 || ++tries < 2)) {
                        (void)printf("Please enter a longer password.\n");


@@ -95,16 +121,16 @@ getnewpasswd(pw)
        /* grab a random printable character that isn't a colon */
        (void)srandom((int)time((time_t *)NULL));
 #ifdef NEWSALT
        /* grab a random printable character that isn't a colon */
        (void)srandom((int)time((time_t *)NULL));
 #ifdef NEWSALT

-       salt[0] = '_';
-       to64(&salt[1], (long)(29*25), 4);
-       to64(&salt[5], (long)random(), 4);
+       salt[0] = _PASSWORD_EFMT1;
+       to64(&salt[1], (long)(29 * 25), 4);
+       to64(&salt[5], random(), 4);

 #else
 #else

-       to64(&salt[0], (long)random(), 2);
+       to64(&salt[0], random(), 2);

 #endif
        return(crypt(buf, salt));
 }
 
 #endif
        return(crypt(buf, salt));
 }
 

-static unsigned char itoa64[] =                /* 0..63 => ascii-64 */
+static unsigned char itoa64[] =                /* 0 ... 63 => ascii - 64 */

        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 to64(s, v, n)
        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
 to64(s, v, n)