diff options
| author |   Mateusz Guzik <mjg@FreeBSD.org> | 2014-06-27 18:51:19 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2014-06-27 18:51:19 +0000 |
| commit | ec38f236f5878517e197d23378b2b85218ea69d7 (patch) | |
| tree | 28fba3296d3c0f8b83e05a13addd265ae855b24b /pw/pw_user.c | |
| parent | 9acd20af22bc708251d15272f413578c3fb5af87 (diff) | |
| download | pw-darwin-ec38f236f5878517e197d23378b2b85218ea69d7.tar.gz pw-darwin-ec38f236f5878517e197d23378b2b85218ea69d7.tar.zst pw-darwin-ec38f236f5878517e197d23378b2b85218ea69d7.zip | |
pw: fix up deletion of users from groups
Previuosly given 'foo,bar' members, removing 'foo' would result in an
infinite loop.
PR: 191427
Submitted by: Voradesh Yenbut <yenbut cs.washington.edu>
MFC after: 1 week
Diffstat (limited to 'pw/pw_user.c')
| -rw-r--r-- | pw/pw_user.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 4b3f550..36c5d9d 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -438,14 +438,13 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args) delgrent(GETGRNAM(a_name->val)); SETGRENT(); while ((grp = GETGRENT()) != NULL) { - int i; + int i, j; char group[MAXLOGNAME]; if (grp->gr_mem != NULL) { for (i = 0; grp->gr_mem[i] != NULL; i++) { if (!strcmp(grp->gr_mem[i], a_name->val)) { - while (grp->gr_mem[i] != NULL) { - grp->gr_mem[i] = grp->gr_mem[i+1]; - } + 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); } |