Author: emaste
Date: Fri Sep 8 21:16:23 2017
New Revision: 323333
URL: https://svnweb.freebsd.org/changeset/base/323333
Log:
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
Modified:
stable/10/usr.sbin/pw/pw_user.c
stable/10/usr.sbin/pw/tests/pw_usermod_test.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/pw/pw_user.c
==============================================================================
--- stable/10/usr.sbin/pw/pw_user.c Fri Sep 8 21:02:15 2017
(r323332)
+++ stable/10/usr.sbin/pw/pw_user.c Fri Sep 8 21:16:23 2017
(r323333)
@@ -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));
}
}
Modified: stable/10/usr.sbin/pw/tests/pw_usermod_test.sh
==============================================================================
--- stable/10/usr.sbin/pw/tests/pw_usermod_test.sh Fri Sep 8 21:02:15
2017 (r323332)
+++ stable/10/usr.sbin/pw/tests/pw_usermod_test.sh Fri Sep 8 21:16:23
2017 (r323333)
@@ -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
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
