diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2015-08-01 12:18:48 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-08-01 12:18:48 +0000 |
| commit | 5bb254a38fa9e233bcdb24956e1f8ccf2b19182b (patch) | |
| tree | c8cd68e3a1ebde2d6a577a92162935d0a778c39b /pw/pw_user.c | |
| parent | 99c28d09467b167abaa8b517679f480b4e21d40b (diff) | |
| download | pw-darwin-5bb254a38fa9e233bcdb24956e1f8ccf2b19182b.tar.gz pw-darwin-5bb254a38fa9e233bcdb24956e1f8ccf2b19182b.tar.zst pw-darwin-5bb254a38fa9e233bcdb24956e1f8ccf2b19182b.zip | |
Partial revert of r286152
More work needed on the cli validation
Diffstat (limited to 'pw/pw_user.c')
| -rw-r--r-- | pw/pw_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 6e07f1f..eca8235 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 (conf.expire_days > 0) - cnf->expire_days = conf.expire_days; + if ((arg = getarg(args, 'e')) != NULL) + cnf->expire_days = atoi(arg->val); if ((arg = getarg(args, 'y')) != NULL) cnf->nispasswd = arg->val; - if (conf.password_days > 0) - cnf->password_days = conf.password_days; + if ((arg = getarg(args, 'p')) != NULL && arg->val) + cnf->password_days = atoi(arg->val); if ((arg = getarg(args, 'g')) != NULL) { if (!*(p = arg->val)) /* Handle empty group list specially */ |