Don't forget to '\n'-terminate new entries. This unbreaks chpass -a.

[pw-darwin.git] / libc / gen / pw_scan.c

diff --git a/libc/gen/pw_scan.c b/libc/gen/pw_scan.c
index 3ecb9e0ac07a834bca82da7d09abde7c2b929fb7..e785511d2cae0c66f2b908ba882a036f24c38c2a 100644 (file)
--- a/libc/gen/pw_scan.c
+++ b/libc/gen/pw_scan.c
@@ -31,13 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
+#if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)pw_scan.c  8.3 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * This module is used to "verify" password entries by chpass(1) and
@@ -59,12 +57,11 @@ static const char rcsid[] =
 
 /*
  * Some software assumes that IDs are short.  We should emit warnings
- * for id's which can not be stored in a short, but we are more liberal
+ * for id's which cannot be stored in a short, but we are more liberal
  * by default, warning for IDs greater than USHRT_MAX.
  *
- * If pw_big_ids_warning is anything other than -1 on entry to pw_scan()
- * it will be set based on the existance of PW_SCAN_BIG_IDS in the
- * environment.
+ * If pw_big_ids_warning is -1 on entry to pw_scan(), it will be set based
+ * on the existence of PW_SCAN_BIG_IDS in the environment.
  */
 static int     pw_big_ids_warning = -1;
 
@@ -73,7 +70,7 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
 {
        uid_t id;
        int root;
-       char *p, *sh;
+       char *ep, *p, *sh;
 
        if (pw_big_ids_warning == -1)
                pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;
@@ -82,12 +79,13 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
        if (!(pw->pw_name = strsep(&bp, ":")))          /* login */
                goto fmt;
        root = !strcmp(pw->pw_name, "root");
-       if(pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
+       if (pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
                pw->pw_fields |= _PWF_NAME;
 
        if (!(pw->pw_passwd = strsep(&bp, ":")))        /* passwd */
                goto fmt;
-       if(pw->pw_passwd[0]) pw->pw_fields |= _PWF_PASSWD;
+       if (pw->pw_passwd[0])
+               pw->pw_fields |= _PWF_PASSWD;
 
        if (!(p = strsep(&bp, ":")))                    /* uid */
                goto fmt;
@@ -100,10 +98,15 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
                        return (0);
                }
        }
-       id = strtoul(p, (char **)NULL, 10);
+       id = strtoul(p, &ep, 10);
        if (errno == ERANGE) {
                if (flags & _PWSCAN_WARN)
-                       warnx("%s > max uid value (%u)", p, ULONG_MAX);
+                       warnx("%s > max uid value (%lu)", p, ULONG_MAX);
+               return (0);
+       }
+       if (*ep != '\0') {
+               if (flags & _PWSCAN_WARN)
+                       warnx("%s uid is incorrect", p);
                return (0);
        }
        if (root && id) {
@@ -119,11 +122,24 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
 
        if (!(p = strsep(&bp, ":")))                    /* gid */
                goto fmt;
-       if(p[0]) pw->pw_fields |= _PWF_GID;
-       id = strtoul(p, (char **)NULL, 10);
+       if (p[0])
+               pw->pw_fields |= _PWF_GID;
+       else {
+               if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
+                       if (flags & _PWSCAN_WARN)
+                               warnx("no gid for user %s", pw->pw_name);
+                       return (0);
+               }
+       }
+       id = strtoul(p, &ep, 10);
        if (errno == ERANGE) {
                if (flags & _PWSCAN_WARN)
-                       warnx("%s > max gid value (%u)", p, ULONG_MAX);
+                       warnx("%s > max gid value (%lu)", p, ULONG_MAX);
+               return (0);
+       }
+       if (*ep != '\0') {
+               if (flags & _PWSCAN_WARN)
+                       warnx("%s gid is incorrect", p);
                return (0);
        }
        if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
@@ -133,26 +149,32 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
        pw->pw_gid = id;
 
        if (flags & _PWSCAN_MASTER ) {
-               pw->pw_class = strsep(&bp, ":");                /* class */
-               if(pw->pw_class[0]) pw->pw_fields |= _PWF_CLASS;
+               if (!(pw->pw_class = strsep(&bp, ":"))) /* class */
+                       goto fmt;
+               if (pw->pw_class[0])
+                       pw->pw_fields |= _PWF_CLASS;
                
-               if (!(p = strsep(&bp, ":")))                    /* change */
+               if (!(p = strsep(&bp, ":")))            /* change */
                        goto fmt;
-               if(p[0]) pw->pw_fields |= _PWF_CHANGE;
+               if (p[0])
+                       pw->pw_fields |= _PWF_CHANGE;
                pw->pw_change = atol(p);
                
-               if (!(p = strsep(&bp, ":")))                    /* expire */
+               if (!(p = strsep(&bp, ":")))            /* expire */
                        goto fmt;
-               if(p[0]) pw->pw_fields |= _PWF_EXPIRE;
+               if (p[0])
+                       pw->pw_fields |= _PWF_EXPIRE;
                pw->pw_expire = atol(p);
        }
        if (!(pw->pw_gecos = strsep(&bp, ":")))         /* gecos */
                goto fmt;
-       if(pw->pw_gecos[0]) pw->pw_fields |= _PWF_GECOS;
+       if (pw->pw_gecos[0])
+               pw->pw_fields |= _PWF_GECOS;
 
-       if (!(pw->pw_dir = strsep(&bp, ":")))                   /* directory */
+       if (!(pw->pw_dir = strsep(&bp, ":")))           /* directory */
                goto fmt;
-       if(pw->pw_dir[0]) pw->pw_fields |= _PWF_DIR;
+       if (pw->pw_dir[0])
+               pw->pw_fields |= _PWF_DIR;
 
        if (!(pw->pw_shell = strsep(&bp, ":")))         /* shell */
                goto fmt;
@@ -168,7 +190,8 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
                        if (!strcmp(p, sh))
                                break;
                }
-       if(p[0]) pw->pw_fields |= _PWF_SHELL;
+       if (p[0])
+               pw->pw_fields |= _PWF_SHELL;
 
        if ((p = strsep(&bp, ":"))) {                   /* too many */
 fmt: