PREFIX stuff

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

diff --git a/pw/pw_conf.c b/pw/pw_conf.c
index 51672b9ae4932d01faca483a085a773209936ef1..be051648e214186abf5fba2755de996c3311ba7b 100644 (file)
--- a/pw/pw_conf.c
+++ b/pw/pw_conf.c
@@ -1,4 +1,6 @@
 /*-
 /*-

+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *

  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *
  * Copyright (C) 1996
  *     David L. Nugent.  All rights reserved.
  *


@@ -29,9 +31,10 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
   "$FreeBSD$";
 #endif /* not lint */
 

-#include <string.h>
-#include <ctype.h>
+#include <err.h>

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

+#include <string.h>
+#include <unistd.h>

 
 #include "pw.h"
 
 
 #include "pw.h"
 


@@ -90,8 +93,8 @@ static struct userconf config =
        "/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 */

-       "/home",                /* Where to create home directory */
-       0777,                   /* Home directory perms, modified by umask */
+       "/var",         /* Where to create home directory */
+       _DEF_DIRMODE,           /* Home directory perms, modified by umask */

        "/bin",                 /* Where shells are located */
        system_shells,          /* List of shells (first is default) */
        bourne_shell,           /* Default shell */
        "/bin",                 /* Where shells are located */
        system_shells,          /* List of shells (first is default) */
        bourne_shell,           /* Default shell */


@@ -101,8 +104,7 @@ static struct userconf config =
        1000, 32000,            /* Allowed range of uids */
        1000, 32000,            /* Allowed range of gids */
        0,                      /* Days until account expires */
        1000, 32000,            /* Allowed range of uids */
        1000, 32000,            /* Allowed range of gids */
        0,                      /* Days until account expires */

-       0,                      /* Days until password expires */
-       0                       /* size of default_group array */
+       0                       /* Days until password expires */

 };
 
 static char const *comments[_UC_FIELDS] =
 };
 
 static char const *comments[_UC_FIELDS] =


@@ -183,14 +185,32 @@ boolean_val(char const * str, int dflt)
                for (i = 0; boolfalse[i]; i++)
                        if (strcmp(str, boolfalse[i]) == 0)
                                return 0;
                for (i = 0; boolfalse[i]; i++)
                        if (strcmp(str, boolfalse[i]) == 0)
                                return 0;

+       }
+       return dflt;
+}
+
+int
+passwd_val(char const * str, int dflt)
+{
+       if ((str = unquote(str)) != NULL) {
+               int             i;
+
+               for (i = 0; booltrue[i]; i++)
+                       if (strcmp(str, booltrue[i]) == 0)
+                               return P_YES;
+               for (i = 0; boolfalse[i]; i++)
+                       if (strcmp(str, boolfalse[i]) == 0)
+                               return P_NO;

 
                /*
                 * Special cases for defaultpassword
                 */
                if (strcmp(str, "random") == 0)
 
                /*
                 * Special cases for defaultpassword
                 */
                if (strcmp(str, "random") == 0)

-                       return -1;
+                       return P_RANDOM;

                if (strcmp(str, "none") == 0)
                if (strcmp(str, "none") == 0)

-                       return -2;
+                       return P_NONE;
+
+               errx(1, "Invalid value for default password");

        }
        return dflt;
 }
        }
        return dflt;
 }


@@ -198,319 +218,336 @@ boolean_val(char const * str, int dflt)
 char const     *
 boolean_str(int val)
 {
 char const     *
 boolean_str(int val)
 {

-       if (val == -1)
-               return "random";
-       else if (val == -2)
-               return "none";
+       if (val == P_NO)
+               return (boolfalse[0]);
+       else if (val == P_RANDOM)
+               return ("random");
+       else if (val == P_NONE)
+               return ("none");

        else
        else

-               return val ? booltrue[0] : boolfalse[0];
+               return (booltrue[0]);

 }
 
 char           *
 newstr(char const * p)
 {
 }
 
 char           *
 newstr(char const * p)
 {

-       char           *q = NULL;
+       char    *q;

 
 

-       if ((p = unquote(p)) != NULL) {
-               int             l = strlen(p) + 1;
+       if ((p = unquote(p)) == NULL)
+               return (NULL);

 
 

-               if ((q = malloc(l)) != NULL)
-                       memcpy(q, p, l);
-       }
-       return q;
-}
-
-#define LNBUFSZ 1024
+       if ((q = strdup(p)) == NULL)
+               err(1, "strdup()");

 
 

+       return (q);
+}

 
 struct userconf *
 read_userconfig(char const * file)
 {
 
 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) {
-               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 */
-                       }
-
-                       if (p != NULL)
-                               *p = '\0';
-
-                       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;
-                               mode_t          *modeset;
-
-                               while (i < _UC_FIELDS && strcmp(p, kwds[i]) != 0)
-                                       ++i;
+       FILE    *fp;
+       char    *buf, *p;
+       const char *errstr;
+       size_t  linecap;
+       ssize_t linelen;
+
+       buf = NULL;
+       linecap = 0;
+
+       if ((fp = fopen(file, "r")) == NULL)
+               return (&config);
+
+       while ((linelen = getline(&buf, &linecap, fp)) > 0) {
+               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;
+                       mode_t          *modeset;
+
+                       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_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;
+                       switch (i) {
+                       case _UC_DEFAULTPWD:
+                               config.default_password = passwd_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:
                                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_HOMEMODE:
-                                       modeset = setmode(q);
-                                       config.homemode = (q == NULL || !boolean_val(q, 1))
-                                               ? 0777 : getmode(modeset, 0777);
-                                       free(modeset);
-                                       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;
+                               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))
+                                       ? "/var" : newstr(q);
+                               break;
+                       case _UC_HOMEMODE:
+                               modeset = setmode(q);
+                               config.homemode = (q == NULL || !boolean_val(q, 1))
+                                       ? _DEF_DIRMODE : getmode(modeset, _DEF_DIRMODE);
+                               free(modeset);
+                               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:
+                               while ((q = strtok(NULL, toks)) != NULL) {
+                                       if (config.groups == NULL)
+                                               config.groups = sl_init();
+                                       sl_add(config.groups, newstr(q));
+                               }
+                               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) {
+                                       config.min_uid = strtounum(q, 0,
+                                           UID_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid min_uid: '%s';"
+                                                   " ignoring", q);
+                               }
+                               break;
+                       case _UC_MAXUID:
+                               if ((q = unquote(q)) != NULL) {
+                                       config.max_uid = strtounum(q, 0,
+                                           UID_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid max_uid: '%s';"
+                                                   " ignoring", q);
+                               }
+                               break;
+                       case _UC_MINGID:
+                               if ((q = unquote(q)) != NULL) {
+                                       config.min_gid = strtounum(q, 0,
+                                           GID_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid min_gid: '%s';"
+                                                   " ignoring", q);
+                               }
+                               break;
+                       case _UC_MAXGID:
+                               if ((q = unquote(q)) != NULL) {
+                                       config.max_gid = strtounum(q, 0,
+                                           GID_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid max_gid: '%s';"
+                                                   " ignoring", q);
+                               }
+                               break;
+                       case _UC_EXPIRE:
+                               if ((q = unquote(q)) != NULL) {
+                                       config.expire_days = strtonum(q, 0,
+                                           INT_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid expire days:"
+                                                   " '%s'; ignoring", q);
+                               }
+                               break;
+                       case _UC_PASSWORD:
+                               if ((q = unquote(q)) != NULL) {
+                                       config.password_days = strtonum(q, 0,
+                                           INT_MAX, &errstr);
+                                       if (errstr)
+                                               warnx("Invalid password days:"
+                                                   " '%s'; ignoring", q);

                                }
                                }

+                               break;
+                       case _UC_FIELDS:
+                       case _UC_NONE:
+                               break;

                        }
                }
                        }
                }

-               free(buf);
-               fclose(fp);

        }
        }

-       return &config;
+       free(buf);
+       fclose(fp);
+
+       return (&config);

 }
 
 
 int
 }
 
 
 int

-write_userconfig(char const * file)
+write_userconfig(struct userconf *cnf, const char *file)

 {
        int             fd;
 {
        int             fd;

+       int             i, j;
+       FILE           *buffp;
+       FILE           *fp;
+       char            cfgfile[MAXPATHLEN];
+       char           *buf;
+       size_t          sz;
+
+       if (file == NULL) {
+               snprintf(cfgfile, sizeof(cfgfile), "%s/" _PW_CONF,
+                   conf.etcpath);
+               file = cfgfile;
+       }

 
 

-       if (file == NULL)
-               file = _PATH_PW_CONF;
-
-       if ((fd = open(file, O_CREAT | O_RDWR | O_TRUNC | O_EXLOCK, 0644)) != -1) {
-               FILE           *fp;
-
-               if ((fp = fdopen(fd, "w")) == NULL)
-                       close(fd);
-               else {
-                       int             i, j, k;
-                       int             len = LNBUFSZ;
-                       char           *buf = malloc(len);
-
-                       for (i = _UC_NONE; i < _UC_FIELDS; i++) {
-                               int             quote = 1;
-                               char const     *val = buf;
-
-                               *buf = '\0';
-                               switch (i) {
-                               case _UC_DEFAULTPWD:
-                                       val = boolean_str(config.default_password);
-                                       break;
-                               case _UC_REUSEUID:
-                                       val = boolean_str(config.reuse_uids);
-                                       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_NEWMAIL:
-                                       val = config.newmail ? config.newmail : boolean_str(0);
-                                       break;
-                               case _UC_LOGFILE:
-                                       val = config.logfile ? config.logfile : boolean_str(0);
-                                       break;
-                               case _UC_HOMEROOT:
-                                       val = config.home;
-                                       break;
-                               case _UC_HOMEMODE:
-                                       sprintf(buf, "%04o", config.homemode);
-                                       quote = 0;
-                                       break;
-                               case _UC_SHELLPATH:
-                                       val = config.shelldir;
-                                       break;
-                               case _UC_SHELLS:
-                                       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 < 0)
-                                                       l = 0;
-                                               if (l + k + 1 < len || extendline(&buf, &len, len + LNBUFSZ) != -1) {
-                                                       strcpy(buf + k, lbuf);
-                                                       k += l;
-                                               }
-                                       }
-                                       quote = 0;
-                                       break;
-                               case _UC_DEFAULTSHELL:
-                                       val = config.shell_default ? config.shell_default : bourne_shell;
-                                       break;
-                               case _UC_DEFAULTGROUP:
-                                       val = config.default_group ? config.default_group : "";
-                                       break;
-                               case _UC_EXTRAGROUPS:
-                                       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 < 0)
-                                                       l = 0;
-                                               if (l + k + 1 < len || extendline(&buf, &len, len + 1024) != -1) {
-                                                       strcpy(buf + k, lbuf);
-                                                       k +=  l;
-                                               }
-                                       }
-                                       quote = 0;
-                                       break;
-                               case _UC_DEFAULTCLASS:
-                                       val = config.default_class ? config.default_class : "";
-                                       break;
-                               case _UC_MINUID:
-                                       sprintf(buf, "%lu", (unsigned long) config.min_uid);
-                                       quote = 0;
-                                       break;
-                               case _UC_MAXUID:
-                                       sprintf(buf, "%lu", (unsigned long) config.max_uid);
-                                       quote = 0;
-                                       break;
-                               case _UC_MINGID:
-                                       sprintf(buf, "%lu", (unsigned long) config.min_gid);
-                                       quote = 0;
-                                       break;
-                               case _UC_MAXGID:
-                                       sprintf(buf, "%lu", (unsigned long) config.max_gid);
-                                       quote = 0;
-                                       break;
-                               case _UC_EXPIRE:
-                                       sprintf(buf, "%d", config.expire_days);
-                                       quote = 0;
-                                       break;
-                               case _UC_PASSWORD:
-                                       sprintf(buf, "%d", config.password_days);
-                                       quote = 0;
-                                       break;
-                               case _UC_NONE:
-                                       break;
-                               }
+       if ((fd = open(file, O_CREAT|O_RDWR|O_TRUNC|O_EXLOCK, 0644)) == -1)
+               return (0);

 
 

-                               if (comments[i])
-                                       fputs(comments[i], fp);
+       if ((fp = fdopen(fd, "w")) == NULL) {
+               close(fd);
+               return (0);
+       }

 
 

-                               if (*kwds[i]) {
-                                       if (quote)
-                                               fprintf(fp, "%s = \"%s\"\n", kwds[i], val);
-                                       else
-                                               fprintf(fp, "%s = %s\n", kwds[i], val);
+       sz = 0;
+       buf = NULL;
+       buffp = open_memstream(&buf, &sz);
+       if (buffp == NULL)
+               err(EXIT_FAILURE, "open_memstream()");
+
+       for (i = _UC_NONE; i < _UC_FIELDS; i++) {
+               int             quote = 1;
+
+               if (buf != NULL)
+                       memset(buf, 0, sz);
+               rewind(buffp);
+               switch (i) {
+               case _UC_DEFAULTPWD:
+                       fputs(boolean_str(cnf->default_password), buffp);
+                       break;
+               case _UC_REUSEUID:
+                       fputs(boolean_str(cnf->reuse_uids), buffp);
+                       break;
+               case _UC_REUSEGID:
+                       fputs(boolean_str(cnf->reuse_gids), buffp);
+                       break;
+               case _UC_NISPASSWD:
+                       fputs(cnf->nispasswd ?  cnf->nispasswd : "", buffp);
+                       quote = 0;
+                       break;
+               case _UC_DOTDIR:
+                       fputs(cnf->dotdir ?  cnf->dotdir : boolean_str(0),
+                           buffp);
+                       break;
+               case _UC_NEWMAIL:
+                       fputs(cnf->newmail ?  cnf->newmail : boolean_str(0),
+                           buffp);
+                       break;
+               case _UC_LOGFILE:
+                       fputs(cnf->logfile ?  cnf->logfile : boolean_str(0),
+                           buffp);
+                       break;
+               case _UC_HOMEROOT:
+                       fputs(cnf->home, buffp);
+                       break;
+               case _UC_HOMEMODE:
+                       fprintf(buffp, "%04o", cnf->homemode);
+                       quote = 0;
+                       break;
+               case _UC_SHELLPATH:
+                       fputs(cnf->shelldir, buffp);
+                       break;
+               case _UC_SHELLS:
+                       for (j = 0; j < _UC_MAXSHELLS &&
+                           system_shells[j] != NULL; j++)
+                               fprintf(buffp, "%s\"%s\"", j ?
+                                   "," : "", system_shells[j]);
+                       quote = 0;
+                       break;
+               case _UC_DEFAULTSHELL:
+                       fputs(cnf->shell_default ?  cnf->shell_default :
+                           bourne_shell, buffp);
+                       break;
+               case _UC_DEFAULTGROUP:
+                       fputs(cnf->default_group ?  cnf->default_group : "",
+                           buffp);
+                       break;
+               case _UC_EXTRAGROUPS:
+                       for (j = 0; cnf->groups != NULL &&
+                           j < (int)cnf->groups->sl_cur; j++)
+                               fprintf(buffp, "%s\"%s\"", j ?
+                                   "," : "", cnf->groups->sl_str[j]);
+                       quote = 0;
+                       break;
+               case _UC_DEFAULTCLASS:
+                       fputs(cnf->default_class ?  cnf->default_class : "",
+                           buffp);
+                       break;
+               case _UC_MINUID:
+                       fprintf(buffp, "%ju", (uintmax_t)cnf->min_uid);
+                       quote = 0;
+                       break;
+               case _UC_MAXUID:
+                       fprintf(buffp, "%ju", (uintmax_t)cnf->max_uid);
+                       quote = 0;
+                       break;
+               case _UC_MINGID:
+                       fprintf(buffp, "%ju", (uintmax_t)cnf->min_gid);
+                       quote = 0;
+                       break;
+               case _UC_MAXGID:
+                       fprintf(buffp, "%ju", (uintmax_t)cnf->max_gid);
+                       quote = 0;
+                       break;
+               case _UC_EXPIRE:
+                       fprintf(buffp, "%jd", (intmax_t)cnf->expire_days);
+                       quote = 0;
+                       break;
+               case _UC_PASSWORD:
+                       fprintf(buffp, "%jd", (intmax_t)cnf->password_days);
+                       quote = 0;
+                       break;
+               case _UC_NONE:
+                       break;
+               }
+               fflush(buffp);
+
+               if (comments[i])
+                       fputs(comments[i], fp);
+
+               if (*kwds[i]) {
+                       if (quote)
+                               fprintf(fp, "%s = \"%s\"\n", kwds[i], buf);
+                       else
+                               fprintf(fp, "%s = %s\n", kwds[i], buf);

 #if debugging
 #if debugging

-                                       printf("WROTE: %s = %s\n", kwds[i], val);
+                       printf("WROTE: %s = %s\n", kwds[i], buf);

 #endif
 #endif

-                               }
-                       }
-                       free(buf);
-                       return fclose(fp) != EOF;

                }
        }
                }
        }

-       return 0;
+       fclose(buffp);
+       free(buf);
+       return (fclose(fp) != EOF);

 }
 }