summaryrefslogtreecommitdiffstats
path: root/pw/pw_user.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2015-08-01 10:25:55 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2015-08-01 10:25:55 +0000
commit0f8c2526cd0b74e7c575c9254be2e155c14ddf6b (patch)
treed864c49e9019e59946f3c1a4fb591dc7ae1a4894 /pw/pw_user.c
parentb3591c99a329ccaa6eb1c750cd56e5302278b288 (diff)
downloadpw-darwin-0f8c2526cd0b74e7c575c9254be2e155c14ddf6b.tar.gz
pw-darwin-0f8c2526cd0b74e7c575c9254be2e155c14ddf6b.tar.zst
pw-darwin-0f8c2526cd0b74e7c575c9254be2e155c14ddf6b.zip
Validate expiration days and password days from commmand line and pw.conf
Diffstat (limited to 'pw/pw_user.c')
-rw-r--r--pw/pw_user.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c
index eca8235..6e07f1f 100644
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -418,14 +418,14 @@ pw_user(int mode, char *name, long id, struct cargs * args)
errx(EX_OSFILE, "root home `%s' is not a directory", cnf->home);
}
- if ((arg = getarg(args, 'e')) != NULL)
- cnf->expire_days = atoi(arg->val);
+ if (conf.expire_days > 0)
+ cnf->expire_days = conf.expire_days;
if ((arg = getarg(args, 'y')) != NULL)
cnf->nispasswd = arg->val;
- if ((arg = getarg(args, 'p')) != NULL && arg->val)
- cnf->password_days = atoi(arg->val);
+ if (conf.password_days > 0)
+ cnf->password_days = conf.password_days;
if ((arg = getarg(args, 'g')) != NULL) {
if (!*(p = arg->val)) /* Handle empty group list specially */