d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly detect the case where a password entry was changed while we were

Browse Source 
preparing to edit it.

PR:		bin/50563
This commit is contained in:
Dag-Erling Smørgrav 2003-04-09 18:20:51 +00:00
parent a4280091c3
commit e7d9d9217c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libutil/pw_util.c
View File

@ -475,8 +475,7 @@ pw_copy(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw)
*q = '\0';
fpw = pw_scan(r, PWSCAN_MASTER);
*q = t;
if ((old_pw && !pw_equal(fpw, old_pw)) ||
(!old_pw && strcmp(fpw->pw_name, pw->pw_name))) {
if (strcmp(fpw->pw_name, pw->pw_name) != 0) {
/* nope */
free(fpw);
if (write(tfd, p, q - p + 1) != q - p + 1)
@ -484,6 +483,12 @@ pw_copy(int ffd, int tfd, struct passwd *pw, struct passwd *old_pw)
++q;
continue;
}
if (old_pw && !pw_equal(fpw, old_pw)) {
warnx("entry inconsistent");
free(fpw);
errno = EINVAL; /* hack */
goto err;
}
free(fpw);
/* it is, replace it */