30c30
< "$FreeBSD: stable/10/usr.sbin/pw/pw_user.c 273043 2014-10-13 15:56:47Z des $";
---
> "$FreeBSD: stable/10/usr.sbin/pw/pw_user.c 274082 2014-11-04 07:50:48Z bapt $";
323a324,326
> } else {
> if (strspn(a_uid->val, "0123456789") != strlen(a_uid->val))
> errx(EX_USAGE, "-u expects a number");
754c757,775
< 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 */