MF22: Remove confusing comma

[pw-darwin.git] / pw / pw_conf.c

diff --git a/pw/pw_conf.c b/pw/pw_conf.c
index 77778f31af0a03e83a07b802922d4985a29c5712..63742a74349e538a90d2c1f6159adda2696bcb95 100644 (file)
--- a/pw/pw_conf.c
+++ b/pw/pw_conf.c
@@ -22,15 +22,19 @@
  * 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.
  * 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.

- *
- *     $Id: pw_conf.c,v 1.1.1.1 1996/12/09 14:05:35 joerg Exp $

  */
 
  */
 

+#ifndef lint
+static const char rcsid[] =
+       "$Id$";
+#endif /* not lint */
+

 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 
 #include "pw.h"
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
 
 #include "pw.h"

+#include "pwupd.h"

 
 #define debugging 0
 
 
 #define debugging 0
 


@@ -39,6 +43,7 @@ enum {
        _UC_DEFAULTPWD,
        _UC_REUSEUID,
        _UC_REUSEGID,
        _UC_DEFAULTPWD,
        _UC_REUSEUID,
        _UC_REUSEGID,

+       _UC_NISPASSWD,

        _UC_DOTDIR,
        _UC_NEWMAIL,
        _UC_LOGFILE,
        _UC_DOTDIR,
        _UC_NEWMAIL,
        _UC_LOGFILE,


@@ -66,11 +71,6 @@ static char    *system_shells[_UC_MAXSHELLS] =
        "csh"
 };
 
        "csh"
 };
 

-static char    *default_groups[_UC_MAXGROUPS] =
-{
-       NULL
-};
-

 static char const *booltrue[] =
 {
        "yes", "true", "1", "on", NULL
 static char const *booltrue[] =
 {
        "yes", "true", "1", "on", NULL


@@ -85,6 +85,7 @@ static struct userconf config =
        0,                      /* Default password for new users? (nologin) */
        0,                      /* Reuse uids? */
        0,                      /* Reuse gids? */
        0,                      /* Default password for new users? (nologin) */
        0,                      /* Reuse uids? */
        0,                      /* Reuse gids? */

+       NULL,                   /* NIS version of the passwd file */

        "/usr/share/skel",      /* Where to obtain skeleton files */
        NULL,                   /* Mail to send to new accounts */
        "/var/log/userlog",     /* Where to log changes */
        "/usr/share/skel",      /* Where to obtain skeleton files */
        NULL,                   /* Mail to send to new accounts */
        "/var/log/userlog",     /* Where to log changes */


@@ -93,7 +94,7 @@ static struct userconf config =
        system_shells,          /* List of shells (first is default) */
        bourne_shell,           /* Default shell */
        NULL,                   /* Default group name */
        system_shells,          /* List of shells (first is default) */
        bourne_shell,           /* Default shell */
        NULL,                   /* Default group name */

-       default_groups,         /* Default (additional) groups */
+       NULL,                   /* Default (additional) groups */

        NULL,                   /* Default login class */
        1000, 32000,            /* Allowed range of uids */
        1000, 32000,            /* Allowed range of gids */
        NULL,                   /* Default login class */
        1000, 32000,            /* Allowed range of uids */
        1000, 32000,            /* Allowed range of gids */


@@ -107,6 +108,7 @@ static char const *comments[_UC_FIELDS] =
        "\n# Password for new users? no=nologin yes=loginid none=blank random=random\n",
        "\n# Reuse gaps in uid sequence? (yes or no)\n",
        "\n# Reuse gaps in gid sequence? (yes or no)\n",
        "\n# Password for new users? no=nologin yes=loginid none=blank random=random\n",
        "\n# Reuse gaps in uid sequence? (yes or no)\n",
        "\n# Reuse gaps in gid sequence? (yes or no)\n",

+       "\n# Path to the NIS passwd file (blank or 'no' for none)\n",

        "\n# Obtain default dotfiles from this directory\n",
        "\n# Mail this file to new user (/etc/newuser.msg or no)\n",
        "\n# Log add/change/remove information in this file\n",
        "\n# Obtain default dotfiles from this directory\n",
        "\n# Mail this file to new user (/etc/newuser.msg or no)\n",
        "\n# Log add/change/remove information in this file\n",


@@ -131,6 +133,7 @@ static char const *kwds[] =
        "defaultpasswd",
        "reuseuids",
        "reusegids",
        "defaultpasswd",
        "reuseuids",
        "reusegids",

+       "nispasswd",

        "skeleton",
        "newmail",
        "logfile",
        "skeleton",
        "newmail",
        "logfile",


@@ -212,126 +215,148 @@ newstr(char const * p)
        return q;
 }
 
        return q;
 }
 

+#define LNBUFSZ 1024
+

 
 struct userconf *
 read_userconfig(char const * file)
 {
        FILE           *fp;
 
 
 struct userconf *
 read_userconfig(char const * file)
 {
        FILE           *fp;
 

+       extendarray(&config.groups, &config.numgroups, 200);
+       memset(config.groups, 0, config.numgroups * sizeof(char *));

        if (file == NULL)
                file = _PATH_PW_CONF;
        if ((fp = fopen(file, "r")) != NULL) {
        if (file == NULL)
                file = _PATH_PW_CONF;
        if ((fp = fopen(file, "r")) != NULL) {

-               char            buf[_UC_MAXLINE];
-
-               while (fgets(buf, sizeof buf, fp) != NULL) {
-                       char           *p = strchr(buf, '\n');
-
-                       if (p == NULL) {        /* Line too long */
-                               int             ch;
+               int         buflen = LNBUFSZ;
+               char       *buf = malloc(buflen);
+
+       nextline:
+               while (fgets(buf, buflen, fp) != NULL) {
+                       char           *p;
+
+                       while ((p = strchr(buf, '\n')) == NULL) {
+                               int       l;
+                               if (extendline(&buf, &buflen, buflen + LNBUFSZ) == -1) {
+                                       int     ch;
+                                       while ((ch = fgetc(fp)) != '\n' && ch != EOF);
+                                       goto nextline;  /* Ignore it */
+                               }
+                               l = strlen(buf);
+                               if (fgets(buf + l, buflen - l, fp) == NULL)
+                                       break;  /* Unterminated last line */
+                       }

 
 

-                               while ((ch = fgetc(fp)) != '\n' && ch != EOF);
-                       } else {
+                       if (p != NULL)

                                *p = '\0';
                                *p = '\0';

-                               if (*buf && *buf != '\n' && (p = strtok(buf, " \t\r\n=")) != NULL && *p != '#') {
-                                       static char const toks[] = " \t\r\n,=";
-                                       char           *q = strtok(NULL, toks);
-                                       int             i = 0;

 
 

-                                       while (i < _UC_FIELDS && strcmp(p, kwds[i]) != 0)
-                                               ++i;
+                       if (*buf && (p = strtok(buf, " \t\r\n=")) != NULL && *p != '#') {
+                               static char const toks[] = " \t\r\n,=";
+                               char           *q = strtok(NULL, toks);
+                               int             i = 0;
+
+                               while (i < _UC_FIELDS && strcmp(p, kwds[i]) != 0)
+                                       ++i;

 #if debugging
 #if debugging

-                                       if (i == _UC_FIELDS)
-                                               printf("Got unknown kwd `%s' val=`%s'\n", p, q ? q : "");
-                                       else
-                                               printf("Got kwd[%s]=%s\n", p, q);
+                               if (i == _UC_FIELDS)
+                                       printf("Got unknown kwd `%s' val=`%s'\n", p, q ? q : "");
+                               else
+                                       printf("Got kwd[%s]=%s\n", p, q);

 #endif
 #endif

-                                       switch (i) {
-                                       case _UC_DEFAULTPWD:
-                                               config.default_password = boolean_val(q, 1);
-                                               break;
-                                       case _UC_REUSEUID:
-                                               config.reuse_uids = boolean_val(q, 0);
-                                               break;
-                                       case _UC_REUSEGID:
-                                               config.reuse_gids = boolean_val(q, 0);
-                                               break;
-                                       case _UC_DOTDIR:
-                                               config.dotdir = (q == NULL || !boolean_val(q, 1))
-                                                       ? NULL : newstr(q);
-                                               break;
-                                       case _UC_NEWMAIL:
-                                               config.newmail = (q == NULL || !boolean_val(q, 1))
-                                                       ? NULL : newstr(q);
-                                               break;
-                                       case _UC_LOGFILE:
-                                               config.logfile = (q == NULL || !boolean_val(q, 1))
-                                                       ? NULL : newstr(q);
-                                               break;
-                                       case _UC_HOMEROOT:
-                                               config.home = (q == NULL || !boolean_val(q, 1))
-                                                       ? "/home" : newstr(q);
-                                               break;
-                                       case _UC_SHELLPATH:
-                                               config.shelldir = (q == NULL || !boolean_val(q, 1))
-                                                       ? "/bin" : newstr(q);
-                                               break;
-                                       case _UC_SHELLS:
-                                               for (i = 0; i < _UC_MAXSHELLS && q != NULL; i++, q = strtok(NULL, toks))
-                                                       system_shells[i] = newstr(q);
-                                               if (i > 0)
-                                                       while (i < _UC_MAXSHELLS)
-                                                               system_shells[i++] = NULL;
-                                               break;
-                                       case _UC_DEFAULTSHELL:
-                                               config.shell_default = (q == NULL || !boolean_val(q, 1))
-                                                       ? (char *) bourne_shell : newstr(q);
-                                               break;
-                                       case _UC_DEFAULTGROUP:
-                                               config.default_group = (q == NULL || !boolean_val(q, 1) || getgrnam(q) == NULL)
-                                                       ? NULL : newstr(q);
-                                               break;
-                                       case _UC_EXTRAGROUPS:
-                                               for (i = 0; i < _UC_MAXGROUPS && q != NULL; i++, q = strtok(NULL, toks))
-                                                       default_groups[i] = newstr(q);
-                                               if (i > 0)
-                                                       while (i < _UC_MAXGROUPS)
-                                                               default_groups[i++] = NULL;
-                                               break;
-                                       case _UC_DEFAULTCLASS:
-                                               config.default_class = (q == NULL || !boolean_val(q, 1))
-                                                       ? NULL : newstr(q);
-                                               break;
-                                       case _UC_MINUID:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.min_uid = (uid_t) atol(q);
-                                               break;
-                                       case _UC_MAXUID:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.max_uid = (uid_t) atol(q);
-                                               break;
-                                       case _UC_MINGID:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.min_gid = (gid_t) atol(q);
-                                               break;
-                                       case _UC_MAXGID:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.max_gid = (gid_t) atol(q);
-                                               break;
-                                       case _UC_EXPIRE:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.expire_days = atoi(q);
-                                               break;
-                                       case _UC_PASSWORD:
-                                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                                       config.password_days = atoi(q);
-                                               break;
-                                       case _UC_FIELDS:
-                                       case _UC_NONE:
-                                               break;
+                               switch (i) {
+                               case _UC_DEFAULTPWD:
+                                       config.default_password = boolean_val(q, 1);
+                                       break;
+                               case _UC_REUSEUID:
+                                       config.reuse_uids = boolean_val(q, 0);
+                                       break;
+                               case _UC_REUSEGID:
+                                       config.reuse_gids = boolean_val(q, 0);
+                                       break;
+                               case _UC_NISPASSWD:
+                                       config.nispasswd = (q == NULL || !boolean_val(q, 1))
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_DOTDIR:
+                                       config.dotdir = (q == NULL || !boolean_val(q, 1))
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_NEWMAIL:
+                                       config.newmail = (q == NULL || !boolean_val(q, 1))
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_LOGFILE:
+                                       config.logfile = (q == NULL || !boolean_val(q, 1))
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_HOMEROOT:
+                                       config.home = (q == NULL || !boolean_val(q, 1))
+                                               ? "/home" : newstr(q);
+                                       break;
+                               case _UC_SHELLPATH:
+                                       config.shelldir = (q == NULL || !boolean_val(q, 1))
+                                               ? "/bin" : newstr(q);
+                                       break;
+                               case _UC_SHELLS:
+                                       for (i = 0; i < _UC_MAXSHELLS && q != NULL; i++, q = strtok(NULL, toks))
+                                               system_shells[i] = newstr(q);
+                                       if (i > 0)
+                                               while (i < _UC_MAXSHELLS)
+                                                       system_shells[i++] = NULL;
+                                       break;
+                               case _UC_DEFAULTSHELL:
+                                       config.shell_default = (q == NULL || !boolean_val(q, 1))
+                                               ? (char *) bourne_shell : newstr(q);
+                                       break;
+                               case _UC_DEFAULTGROUP:
+                                       q = unquote(q);
+                                       config.default_group = (q == NULL || !boolean_val(q, 1) || getgrnam(q) == NULL)
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_EXTRAGROUPS:
+                                       for (i = 0; q != NULL; q = strtok(NULL, toks)) {
+                                               if (extendarray(&config.groups, &config.numgroups, i + 2) != -1)
+                                                       config.groups[i++] = newstr(q);

                                        }
                                        }

+                                       if (i > 0)
+                                               while (i < config.numgroups)
+                                                       config.groups[i++] = NULL;
+                                       break;
+                               case _UC_DEFAULTCLASS:
+                                       config.default_class = (q == NULL || !boolean_val(q, 1))
+                                               ? NULL : newstr(q);
+                                       break;
+                               case _UC_MINUID:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.min_uid = (uid_t) atol(q);
+                                       break;
+                               case _UC_MAXUID:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.max_uid = (uid_t) atol(q);
+                                       break;
+                               case _UC_MINGID:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.min_gid = (gid_t) atol(q);
+                                       break;
+                               case _UC_MAXGID:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.max_gid = (gid_t) atol(q);
+                                       break;
+                               case _UC_EXPIRE:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.expire_days = atoi(q);
+                                       break;
+                               case _UC_PASSWORD:
+                                       if ((q = unquote(q)) != NULL && isdigit(*q))
+                                               config.password_days = atoi(q);
+                                       break;
+                               case _UC_FIELDS:
+                               case _UC_NONE:
+                                       break;

                                }
                        }
                }
                                }
                        }
                }

+               free(buf);

                fclose(fp);
        }
        return &config;
                fclose(fp);
        }
        return &config;


@@ -353,7 +378,8 @@ write_userconfig(char const * file)
                        close(fd);
                else {
                        int             i, j, k;
                        close(fd);
                else {
                        int             i, j, k;

-                       char            buf[_UC_MAXLINE];
+                       int             len = LNBUFSZ;
+                       char           *buf = malloc(len);

 
                        for (i = _UC_NONE; i < _UC_FIELDS; i++) {
                                int             quote = 1;
 
                        for (i = _UC_NONE; i < _UC_FIELDS; i++) {
                                int             quote = 1;


@@ -370,6 +396,10 @@ write_userconfig(char const * file)
                                case _UC_REUSEGID:
                                        val = boolean_str(config.reuse_gids);
                                        break;
                                case _UC_REUSEGID:
                                        val = boolean_str(config.reuse_gids);
                                        break;

+                               case _UC_NISPASSWD:
+                                       val = config.nispasswd ? config.nispasswd : "";
+                                       quote = 0;
+                                       break;

                                case _UC_DOTDIR:
                                        val = config.dotdir ? config.dotdir : boolean_str(0);
                                        break;
                                case _UC_DOTDIR:
                                        val = config.dotdir ? config.dotdir : boolean_str(0);
                                        break;


@@ -386,8 +416,14 @@ write_userconfig(char const * file)
                                        val = config.shelldir;
                                        break;
                                case _UC_SHELLS:
                                        val = config.shelldir;
                                        break;
                                case _UC_SHELLS:

-                                       for (j = k = 0; j < _UC_MAXSHELLS && system_shells[j] != NULL; j++)
-                                               k += sprintf(buf + k, "%s\"%s\"", k ? "," : "", system_shells[j]);
+                                       for (j = k = 0; j < _UC_MAXSHELLS && system_shells[j] != NULL; j++) {
+                                               char    lbuf[64];
+                                               int     l = snprintf(lbuf, sizeof lbuf, "%s\"%s\"", k ? "," : "", system_shells[j]);
+                                               if (l + k + 1 < len || extendline(&buf, &len, len + LNBUFSZ) != -1) {
+                                                       strcpy(buf + k, lbuf);
+                                                       k += l;
+                                               }
+                                       }

                                        quote = 0;
                                        break;
                                case _UC_DEFAULTSHELL:
                                        quote = 0;
                                        break;
                                case _UC_DEFAULTSHELL:


@@ -397,8 +433,15 @@ write_userconfig(char const * file)
                                        val = config.default_group ? config.default_group : "";
                                        break;
                                case _UC_EXTRAGROUPS:
                                        val = config.default_group ? config.default_group : "";
                                        break;
                                case _UC_EXTRAGROUPS:

-                                       for (j = k = 0; j < _UC_MAXGROUPS && default_groups[j] != NULL; j++)
-                                               k += sprintf(buf + k, "%s\"%s\"", k ? "," : "", default_groups[j]);
+                                       extendarray(&config.groups, &config.numgroups, 200);
+                                       for (j = k = 0; j < config.numgroups && config.groups[j] != NULL; j++) {
+                                               char    lbuf[64];
+                                               int     l = snprintf(lbuf, sizeof lbuf, "%s\"%s\"", k ? "," : "", config.groups[j]);
+                                               if (l + k + 1 < len || extendline(&buf, &len, len + 1024) != -1) {
+                                                       strcpy(buf + k, lbuf);
+                                                       k +=  l;
+                                               }
+                                       }

                                        quote = 0;
                                        break;
                                case _UC_DEFAULTCLASS:
                                        quote = 0;
                                        break;
                                case _UC_DEFAULTCLASS:


@@ -445,6 +488,7 @@ write_userconfig(char const * file)
 #endif
                                }
                        }
 #endif
                                }
                        }

+                       free(buf);

                        return fclose(fp) != EOF;
                }
        }
                        return fclose(fp) != EOF;
                }
        }