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 00f640bd0e9a09cec193446dacfa21d6fcc91bb6..e785511d2cae0c66f2b908ba882a036f24c38c2a 100644 (file)
--- a/libc/gen/pw_scan.c
+++ b/libc/gen/pw_scan.c
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#ifndef lint
+#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 /* 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


@@ -43,9 +45,9 @@ static char sccsid[] = "@(#)pw_scan.c 8.3 (Berkeley) 4/2/94";
 #include <sys/param.h>
 
 #include <err.h>
 #include <sys/param.h>
 
 #include <err.h>

+#include <errno.h>

 #include <fcntl.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <pwd.h>

-#include <errno.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>


@@ -53,70 +55,126 @@ static char sccsid[] = "@(#)pw_scan.c      8.3 (Berkeley) 4/2/94";
 
 #include "pw_scan.h"
 
 
 #include "pw_scan.h"
 

+/*
+ * Some software assumes that IDs are short.  We should emit warnings
+ * 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 -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;
+

 int
 int

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

 {
 {

-       long id;
+       uid_t id;

        int root;
        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;

 
        pw->pw_fields = 0;
        if (!(pw->pw_name = strsep(&bp, ":")))          /* login */
                goto fmt;
        root = !strcmp(pw->pw_name, "root");
 
        pw->pw_fields = 0;
        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;

-       if(p[0]) pw->pw_fields |= _PWF_UID;
-       id = atol(p);
+       if (p[0])
+               pw->pw_fields |= _PWF_UID;
+       else {
+               if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
+                       if (flags & _PWSCAN_WARN)
+                               warnx("no uid for user %s", pw->pw_name);
+                       return (0);
+               }
+       }
+       id = strtoul(p, &ep, 10);
+       if (errno == ERANGE) {
+               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) {
        if (root && id) {

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

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

-       if (id > USHRT_MAX) {
-               warnx("%s > max uid value (%d)", p, 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! */
        }
        pw->pw_uid = id;
 
        if (!(p = strsep(&bp, ":")))                    /* gid */
                goto fmt;
                /*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
        }
        pw->pw_uid = id;
 
        if (!(p = strsep(&bp, ":")))                    /* gid */
                goto fmt;

-       if(p[0]) pw->pw_fields |= _PWF_GID;
-       id = atol(p);
-       if (id > USHRT_MAX) {
-               warnx("%s > max gid value (%d)", p, USHRT_MAX);
+       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 (%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) {
+               warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);

                /* return (0); This should not be fatal! */
        }
        pw->pw_gid = id;
 
                /* 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;
 
        if (!(pw->pw_shell = strsep(&bp, ":")))         /* shell */
                goto fmt;


@@ -125,16 +183,20 @@ pw_scan(bp, pw)
        if (root && *p)                                 /* empty == /bin/sh */
                for (setusershell();;) {
                        if (!(sh = getusershell())) {
        if (root && *p)                                 /* empty == /bin/sh */
                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;
+       if (p[0])
+               pw->pw_fields |= _PWF_SHELL;

 
 

-       if (p = strsep(&bp, ":")) {                     /* too many */
-fmt:           warnx("corrupted entry");
+       if ((p = strsep(&bp, ":"))) {                   /* too many */
+fmt:           
+               if (flags & _PWSCAN_WARN)
+                       warnx("corrupted entry");

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