integrate from head@185615

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

diff --git a/libc/gen/pw_scan.c b/libc/gen/pw_scan.c
index d0fb5f17d03516c29cadf9dc8ad09cbfb4379fbd..9242dd054244ebe89b7cede690de1dcedf24d7b3 100644 (file)
--- a/libc/gen/pw_scan.c
+++ b/libc/gen/pw_scan.c
@@ -10,10 +10,6 @@
  * 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.
  * 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.
  * 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.


@@ -31,13 +27,11 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#ifndef lint
-#if 0
+#if defined(LIBC_SCCS) && !defined(lint)

 static char sccsid[] = "@(#)pw_scan.c  8.3 (Berkeley) 4/2/94";
 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
 
 /*
  * This module is used to "verify" password entries by chpass(1) and


@@ -59,23 +53,20 @@ static const char rcsid[] =
 
 /*
  * Some software assumes that IDs are short.  We should emit warnings
 
 /*
  * 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.
  *
  * 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.

  */
  */

-int    pw_big_ids_warning = -1;
+static int     pw_big_ids_warning = -1;

 
 int
 
 int

-pw_scan(bp, pw)
-       char *bp;
-       struct passwd *pw;
+__pw_scan(char *bp, struct passwd *pw, int flags)

 {
        uid_t id;
        int root;
 {
        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;
 
        if (pw_big_ids_warning == -1)
                pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;


@@ -84,12 +75,13 @@ pw_scan(bp, pw)
        if (!(pw->pw_name = strsep(&bp, ":")))          /* login */
                goto fmt;
        root = !strcmp(pw->pw_name, "root");
        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;
                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;
 
        if (!(p = strsep(&bp, ":")))                    /* uid */
                goto fmt;


@@ -97,20 +89,28 @@ pw_scan(bp, pw)
                pw->pw_fields |= _PWF_UID;
        else {
                if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
                pw->pw_fields |= _PWF_UID;
        else {
                if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {

-                       warnx("no uid for user %s", pw->pw_name);
+                       if (flags & _PWSCAN_WARN)
+                               warnx("no uid for user %s", pw->pw_name);

                        return (0);
                }
        }
                        return (0);
                }
        }

-       id = strtoul(p, (char **)NULL, 10);
+       id = strtoul(p, &ep, 10);

        if (errno == ERANGE) {
        if (errno == ERANGE) {

-               warnx("%s > max uid value (%u)", p, ULONG_MAX);
+               if (flags & _PWSCAN_WARN)
+                       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) {
                return (0);
        }
        if (root && id) {

-               warnx("root uid should be 0");
+               if (flags & _PWSCAN_WARN)
+                       warnx("root uid should be 0");

                return (0);
        }
                return (0);
        }

-       if (pw_big_ids_warning && id > USHRT_MAX) {
+       if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {

                warnx("%s > recommended max uid value (%u)", p, USHRT_MAX);
                /*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
        }
                warnx("%s > recommended max uid value (%u)", p, USHRT_MAX);
                /*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
        }


@@ -118,56 +118,83 @@ pw_scan(bp, pw)
 
        if (!(p = strsep(&bp, ":")))                    /* gid */
                goto fmt;
 
        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 (errno == ERANGE) {

-               warnx("%s > max gid value (%u)", p, ULONG_MAX);
+               if (flags & _PWSCAN_WARN)
+                       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);
        }
                return (0);
        }

-       if (pw_big_ids_warning && id > USHRT_MAX) {
+       if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {

                warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);
                /* return (0); This should not be fatal! */
        }
        pw->pw_gid = id;
 
                warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);
                /* return (0); This should not be fatal! */
        }
        pw->pw_gid = id;
 

-       pw->pw_class = strsep(&bp, ":");                /* class */
-       if(pw->pw_class[0]) pw->pw_fields |= _PWF_CLASS;
-
-       if (!(p = strsep(&bp, ":")))                    /* change */
-               goto fmt;
-       if(p[0]) pw->pw_fields |= _PWF_CHANGE;
-       pw->pw_change = atol(p);
-
-       if (!(p = strsep(&bp, ":")))                    /* expire */
-               goto fmt;
-       if(p[0]) pw->pw_fields |= _PWF_EXPIRE;
-       pw->pw_expire = atol(p);
-
+       if (flags & _PWSCAN_MASTER ) {
+               if (!(pw->pw_class = strsep(&bp, ":"))) /* class */
+                       goto fmt;
+               if (pw->pw_class[0])
+                       pw->pw_fields |= _PWF_CLASS;
+               
+               if (!(p = strsep(&bp, ":")))            /* change */
+                       goto fmt;
+               if (p[0])
+                       pw->pw_fields |= _PWF_CHANGE;
+               pw->pw_change = atol(p);
+               
+               if (!(p = strsep(&bp, ":")))            /* expire */
+                       goto fmt;
+               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 = 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;
                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;
 
        p = pw->pw_shell;
 
        if (!(pw->pw_shell = strsep(&bp, ":")))         /* shell */
                goto fmt;
 
        p = pw->pw_shell;

-       if (root && *p)                                 /* empty == /bin/sh */
+       if (root && *p) {                               /* empty == /bin/sh */

                for (setusershell();;) {
                        if (!(sh = getusershell())) {
                for (setusershell();;) {
                        if (!(sh = getusershell())) {

-                               warnx("warning, unknown root shell");
+                               if (flags & _PWSCAN_WARN)
+                                       warnx("warning, unknown root shell");

                                break;
                        }
                        if (!strcmp(p, sh))
                                break;
                }
                                break;
                        }
                        if (!strcmp(p, sh))
                                break;
                }

-       if(p[0]) pw->pw_fields |= _PWF_SHELL;
+               endusershell();
+       }
+       if (p[0])
+               pw->pw_fields |= _PWF_SHELL;

 
        if ((p = strsep(&bp, ":"))) {                   /* too many */
 
        if ((p = strsep(&bp, ":"))) {                   /* too many */

-fmt:           warnx("corrupted entry");
+fmt:           
+               if (flags & _PWSCAN_WARN)
+                       warnx("corrupted entry");

                return (0);
        }
        return (1);
                return (0);
        }
        return (1);