diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-28 14:19:17 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-28 14:19:17 +0000 |
| commit | c61c6f66352171814a5d114527357d837df5cad9 (patch) | |
| tree | 95e0782ff2f9ea07caf5df35e568926c688625cb /pw | |
| parent | b7e8ed77b08007dc43e75eeb44563caf5942668d (diff) | |
| download | pw-darwin-c61c6f66352171814a5d114527357d837df5cad9.tar.gz pw-darwin-c61c6f66352171814a5d114527357d837df5cad9.tar.zst pw-darwin-c61c6f66352171814a5d114527357d837df5cad9.zip | |
Fix a regression in pw usermod -G list
The user was perperly adding the to different groups from "list" but was not
removed from the other groups it could have belong to.
While here add a regression test about this bug
PR: 185666
Reported by: sub.mesa@gmail.com
MFC after: 1 week
Diffstat (limited to 'pw')
| -rw-r--r-- | pw/pw_user.c | 20 | ||||
| -rwxr-xr-x | pw/tests/pw_modify.sh | 21 |
2 files changed, 40 insertions, 1 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index efb2901..0b56b81 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -751,7 +751,25 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) */ if (mode == M_ADD || getarg(args, 'G') != NULL) { - int i; + int i, j; + /* First remove the user from all group */ + SETGRENT(); + while ((grp = GETGRENT()) != NULL) { + char group[MAXLOGNAME]; + if (grp->gr_mem == NULL) + continue; + for (i = 0; grp->gr_mem[i] != NULL; i++) { + if (strcmp(grp->gr_mem[i] , pwd->pw_name) != 0) + continue; + for (j = i; grp->gr_mem[j] != NULL ; j++) + grp->gr_mem[j] = grp->gr_mem[j+1]; + strlcpy(group, grp->gr_name, MAXLOGNAME); + chggrent(group, grp); + } + } + ENDGRENT(); + + /* now add to group where needed */ for (i = 0; cnf->groups[i] != NULL; i++) { grp = GETGRNAM(cnf->groups[i]); grp = gr_add(grp, pwd->pw_name); diff --git a/pw/tests/pw_modify.sh b/pw/tests/pw_modify.sh index c3af517..5888111 100755 --- a/pw/tests/pw_modify.sh +++ b/pw/tests/pw_modify.sh @@ -38,8 +38,29 @@ groupmod_bug_193704_body() { atf_check -s exit:65 -e match:"^pw: unknown group" -x pw -V ${HOME} groupshow test } +atf_test_case usermod_bug_185666 +usermod_bug_185666_head() { + atf_set "descr" "Regression test for the #185666 bug" +} + +usermod_bug_185666_body() { + populate_etc_skel + atf_check -s exit:0 -x pw -V ${HOME} useradd testuser + atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup + atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup2 + atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup + atf_check -o inline:"testuser:*:1001:\n" -x pw -V${HOME} groupshow testuser + atf_check -o inline:"testgroup:*:1002:testuser\n" -x pw -V ${HOME} groupshow testgroup + atf_check -o inline:"testgroup2:*:1003:\n" -x pw -V${HOME} groupshow testgroup2 + atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup2 + atf_check -o inline:"testuser:*:1001:\n" -x pw -V ${HOME} groupshow testuser + atf_check -o inline:"testgroup:*:1002:\n" -x pw -V ${HOME} groupshow testgroup + atf_check -o inline:"testgroup2:*:1003:testuser\n" -x pw -V ${HOME} groupshow testgroup2 +} + atf_init_test_cases() { atf_add_test_case groupmod_user atf_add_test_case groupmod_invalid_user atf_add_test_case groupmod_bug_193704 + atf_add_test_case usermod_bug_185666 } |