Set the pw_class field to NULL when scanning the non-master passwd file.

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

diff --git a/libc/gen/pw_scan.c b/libc/gen/pw_scan.c
index 04cc388c8210a8bd0cbd13534923391f6d4a64e8..01146e9111d102670774dd2f3a3181599ddcb665 100644 (file)
--- a/libc/gen/pw_scan.c
+++ b/libc/gen/pw_scan.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -10,11 +12,7 @@
  * 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
+ * 3. 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.
  *
@@ -31,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pw_scan.c  8.3 (Berkeley) 4/2/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)pw_scan.c        8.3 (Berkeley) 4/2/94");
 __FBSDID("$FreeBSD$");
 
 /*
@@ -46,9 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <pwd.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -62,8 +56,14 @@ __FBSDID("$FreeBSD$");
  *
  * 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.
+ *
+ * It is believed all baseline system software that can not handle the
+ * normal ID sizes is now gone so pw_big_ids_warning is disabled for now.
+ * But the code has been left in place in case end-users want to re-enable
+ * it and/or for the next time the ID sizes get bigger but pieces of the
+ * system lag behind.
  */
-static int     pw_big_ids_warning = -1;
+static int     pw_big_ids_warning = 0;
 
 int
 __pw_scan(char *bp, struct passwd *pw, int flags)
@@ -71,6 +71,7 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
        uid_t id;
        int root;
        char *ep, *p, *sh;
+       unsigned long temp;
 
        if (pw_big_ids_warning == -1)
                pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;
@@ -98,12 +99,14 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
                        return (0);
                }
        }
-       id = strtoul(p, &ep, 10);
-       if (errno == ERANGE) {
+       errno = 0;
+       temp = strtoul(p, &ep, 10);
+       if ((temp == ULONG_MAX && errno == ERANGE) || temp > UID_MAX) {
                if (flags & _PWSCAN_WARN)
-                       warnx("%s > max uid value (%lu)", p, ULONG_MAX);
+                       warnx("%s > max uid value (%u)", p, UID_MAX);
                return (0);
        }
+       id = temp;
        if (*ep != '\0') {
                if (flags & _PWSCAN_WARN)
                        warnx("%s uid is incorrect", p);
@@ -131,12 +134,14 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
                        return (0);
                }
        }
-       id = strtoul(p, &ep, 10);
-       if (errno == ERANGE) {
+       errno = 0;
+       temp = strtoul(p, &ep, 10);
+       if ((temp == ULONG_MAX && errno == ERANGE) || temp > GID_MAX) {
                if (flags & _PWSCAN_WARN)
-                       warnx("%s > max gid value (%lu)", p, ULONG_MAX);
+                       warnx("%s > max gid value (%u)", p, GID_MAX);
                return (0);
        }
+       id = temp;
        if (*ep != '\0') {
                if (flags & _PWSCAN_WARN)
                        warnx("%s gid is incorrect", p);
@@ -165,7 +170,8 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
                if (p[0])
                        pw->pw_fields |= _PWF_EXPIRE;
                pw->pw_expire = atol(p);
-       }
+       } else
+               pw->pw_class = NULL;
        if (!(pw->pw_gecos = strsep(&bp, ":")))         /* gecos */
                goto fmt;
        if (pw->pw_gecos[0])