From 9f36a67f69747d2139703a417757f8f158c3e403 Mon Sep 17 00:00:00 2001 From: David Nugent Date: Thu, 20 Jul 2000 05:11:56 +0000 Subject: 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 --- pw/pw_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pw') 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)) -- cgit v1.2.3-56-ge451