From 2a1f63cd14c765f6113684a5695bf294ad206492 Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 8 Sep 2017 21:16:23 +0000 Subject: [PATCH] MFC r322677: pw usermod: handle empty secondary group lists (-G '') "pw usermod someuser -G ''" is supposed make sure that someuser doesn't have any secondary group memberships. Previouly it was a nop because split_groups() only intitialised "groups" if at least one group was specified. As a result the existing secondary group memberships were kept. PR: 221417 Submitted by: Fabian Keil Approved by: re (kib) Obtained from: ElectroBSD Relnotes: yes git-svn-id: svn://svn.freebsd.org/base/stable/10@323333 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/pw/pw_user.c | 4 ++-- usr.sbin/pw/tests/pw_usermod_test.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index 98a963698..62d53a4d0 100644 --- a/usr.sbin/pw/pw_user.c +++ b/usr.sbin/pw/pw_user.c @@ -1089,10 +1089,10 @@ split_groups(StringList **groups, char *groupsstr) char *p; char tok[] = ", \t"; + if (*groups == NULL) + *groups = sl_init(); for (p = strtok(groupsstr, tok); p != NULL; p = strtok(NULL, tok)) { grp = group_from_name_or_id(p); - if (*groups == NULL) - *groups = sl_init(); sl_add(*groups, newstr(grp->gr_name)); } } diff --git a/usr.sbin/pw/tests/pw_usermod_test.sh b/usr.sbin/pw/tests/pw_usermod_test.sh index 6a1313025..cf3622f3b 100755 --- a/usr.sbin/pw/tests/pw_usermod_test.sh +++ b/usr.sbin/pw/tests/pw_usermod_test.sh @@ -128,6 +128,9 @@ user_mod_nogroups_body() { atf_check -s exit:0 ${PW} usermod foo -G test3,test4 atf_check -s exit:0 -o inline:"test3\ntest4\n" \ awk -F\: '$4 == "foo" { print $1 }' ${HOME}/group + atf_check -s exit:0 ${PW} usermod foo -G "" + atf_check -s exit:0 -o empty \ + awk -F\: '$4 == "foo" { print $1 }' ${HOME}/group } atf_test_case user_mod_rename -- 2.42.0