From d79c5099603f0afa9e292d79f9595563cd623cf3 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Sat, 19 Aug 2017 00:19:23 +0000 Subject: pw usermod: Properly deal with 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 Obtained from: ElectroBSD MFC after: 1 week Relnotes: yes --- 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 76849ba..a71be12 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -1087,10 +1087,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)); } } -- cgit v1.2.3-56-ge451