talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a long-standing bug in the rename case previously masked by another bug 

just fixed in .db file updating.
This commit is contained in:
David Nugent 2000-06-18 02:18:15 +00:00
parent f52bcb0a5c
commit 25fa020ea5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/pw/pw_user.c
View File

@ -681,8 +681,16 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
if (mode == M_ADD || getarg(args, 'G') != NULL)
editgroups(pwd->pw_name, cnf->groups);
/* pwd may have been invalidated */
if ((pwd = GETPWNAM(a_name->val)) == NULL)
/* go get a current version of pwd */
pwd = GETPWNAM(a_name->val);
if (pwd == NULL) {
/* This will fail when we rename, so special case that */
if (mode == M_UPDATE && (arg = getarg(args, 'l')) != NULL) {
a_name->val = arg->val; /* update new name */
pwd = GETPWNAM(a_name->val); /* refetch renamed rec */
}
}
if (pwd == NULL) /* can't go on without this */
errx(EX_NOUSER, "user '%s' disappeared during update", a_name->val);
grp = GETGRGID(pwd->pw_gid);