diff options
| -rw-r--r-- | pw/pw.c | 1 | ||||
| -rw-r--r-- | pw/pw_group.c | 2 | ||||
| -rw-r--r-- | pw/pwupd.h | 1 | ||||
| -rwxr-xr-x | pw/tests/pw_useradd.sh | 10 |
4 files changed, 13 insertions, 1 deletions
@@ -215,6 +215,7 @@ main(int argc, char *argv[]) if (mode == -1 || which == -1) cmdhelp(mode, which); + conf.which = which; /* * We know which mode we're in and what we're about to do, so now * let's dispatch the remaining command line args in a genric way. diff --git a/pw/pw_group.c b/pw/pw_group.c index 2a90ff2..c664ef5 100644 --- a/pw/pw_group.c +++ b/pw/pw_group.c @@ -200,7 +200,7 @@ pw_group(int mode, char *name, long id, struct cargs * args) * software. */ - if (conf.fd != -1) + if (conf.which == W_GROUP && conf.fd != -1) set_passwd(grp, mode == M_UPDATE); if (((arg = getarg(args, 'M')) != NULL || @@ -86,6 +86,7 @@ struct pwconf { char *newname; char *config; int fd; + int which; bool dryrun; bool pretty; bool v7; diff --git a/pw/tests/pw_useradd.sh b/pw/tests/pw_useradd.sh index 32d3b9d..469c1e5 100755 --- a/pw/tests/pw_useradd.sh +++ b/pw/tests/pw_useradd.sh @@ -231,6 +231,15 @@ user_add_invalid_group_entry_body() { atf_check -s exit:1 -e match:"Invalid group entry" ${PW} useradd foo2 } +atf_test_case user_add_password_from_h +user_add_password_from_h_body() { + populate_etc_skel + + atf_check -s exit:0 ${PW} useradd test -h 0 <<-EOF + $(echo test) + EOF +} + atf_init_test_cases() { atf_add_test_case user_add atf_add_test_case user_add_noupdate @@ -251,4 +260,5 @@ atf_init_test_cases() { atf_add_test_case user_add_expiration atf_add_test_case user_add_invalid_user_entry atf_add_test_case user_add_invalid_group_entry + atf_add_test_case user_add_password_from_h } |