Remove things that crept in after badly checked revert

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

diff --git a/pw/pw_conf.c b/pw/pw_conf.c
index c6a86b73dc84d24831e4cc6b8fc8107705633230..b723c31a39dd72bbbd7c0a3967e774db4901fac9 100644 (file)
--- a/pw/pw_conf.c
+++ b/pw/pw_conf.c
@@ -228,9 +228,9 @@ read_userconfig(char const * file)
 {
        FILE    *fp;
        char    *buf, *p;
+       const char *errstr;
        size_t  linecap;
        ssize_t linelen;
-       const char *errstr;
 
        buf = NULL;
        linecap = 0;
@@ -325,42 +325,57 @@ read_userconfig(char const * file)
                                break;
                        case _UC_MINUID:
                                if ((q = unquote(q)) != NULL) {
-                                       errstr = NULL;
-                                       config.min_uid = strtounum(q, 0, UID_MAX, &errstr);
+                                       config.min_uid = strtounum(q, 0,
+                                           UID_MAX, &errstr);
                                        if (errstr)
-                                               warnx("Invalid min_uid: '%s', ignoring", q);
+                                               warnx("Invalid min_uid: '%s';"
+                                                   " ignoring", q);
                                }
                                break;
                        case _UC_MAXUID:
                                if ((q = unquote(q)) != NULL) {
-                                       errstr = NULL;
-                                       config.max_uid = strtounum(q, 0, UID_MAX, &errstr);
+                                       config.max_uid = strtounum(q, 0,
+                                           UID_MAX, &errstr);
                                        if (errstr)
-                                               warnx("Invalid max_uid: '%s', ignoring", q);
+                                               warnx("Invalid max_uid: '%s';"
+                                                   " ignoring", q);
                                }
                                break;
                        case _UC_MINGID:
-                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                       errstr = NULL;
-                                       config.min_gid = strtounum(q, 0, GID_MAX, &errstr);
+                               if ((q = unquote(q)) != NULL) {
+                                       config.min_gid = strtounum(q, 0,
+                                           GID_MAX, &errstr);
                                        if (errstr)
-                                               warnx("Invalid min_gid: '%s', ignoring", q);
+                                               warnx("Invalid min_gid: '%s';"
+                                                   " ignoring", q);
+                               }
                                break;
                        case _UC_MAXGID:
                                if ((q = unquote(q)) != NULL) {
-                                       errstr = NULL;
-                                       config.max_gid = strtounum(q, 0, GID_MAX, &errstr);
+                                       config.max_gid = strtounum(q, 0,
+                                           GID_MAX, &errstr);
                                        if (errstr)
-                                               warnx("Invalid max_gid: '%s', ignoring", q);
+                                               warnx("Invalid max_gid: '%s';"
+                                                   " ignoring", q);
                                }
                                break;
                        case _UC_EXPIRE:
-                               if ((q = unquote(q)) != NULL && isdigit(*q))
-                                       config.expire_days = atoi(q);
+                               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 && isdigit(*q))
-                                       config.password_days = atoi(q);
+                               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: