diff options
| author |   David Nugent <davidn@FreeBSD.org> | 2000-07-20 05:11:56 +0000 |
|---|---|---|
| committer | David Nugent <davidn@FreeBSD.org> | 2000-07-20 05:11:56 +0000 |
| commit | 9f36a67f69747d2139703a417757f8f158c3e403 (patch) | |
| tree | 46847eaba6c60c9b8fde6a96cc8db220a6b1e92e /pw | |
| parent | d58f0ff7d3bf5339610977878786ad46492a1a9c (diff) | |
| download | pw-darwin-9f36a67f69747d2139703a417757f8f158c3e403.tar.gz pw-darwin-9f36a67f69747d2139703a417757f8f158c3e403.tar.zst pw-darwin-9f36a67f69747d2139703a417757f8f158c3e403.zip | |
Move test for -w flag outside of the code dealing with -D (defaults).
This should cause -w's argument not to be ignored in the usermod case,
so it will affect modification of the user's password instead of using
the pw.conf (or internal default=no '*') password method.
PR: bin/11168
Diffstat (limited to 'pw')
| -rw-r--r-- | pw/pw_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index c9119a2..2c491fd 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -255,6 +255,8 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) if ((arg = getarg(args, 's')) != NULL) cnf->shell_default = arg->val; + if ((arg = getarg(args, 'w')) != NULL) + cnf->default_password = boolean_val(arg->val, cnf->default_password); if (mode == M_ADD && getarg(args, 'D')) { if (getarg(args, 'n') != NULL) errx(EX_DATAERR, "can't combine `-D' with `-n name'"); @@ -270,8 +272,6 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_gid = (gid_t) atoi(p)) < cnf->min_gid) cnf->max_gid = 32000; } - if ((arg = getarg(args, 'w')) != NULL) - cnf->default_password = boolean_val(arg->val, cnf->default_password); arg = getarg(args, 'C'); if (write_userconfig(arg ? arg->val : NULL)) |