summaryrefslogtreecommitdiffstats
path: root/lib/libutil/pw_util.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-04-09 18:20:51 +0000
committerdes <des@FreeBSD.org>2003-04-09 18:20:51 +0000
commitf514349f09ea64c630ed12ee1b79a2f09fa14d96 (patch)
tree28e3093ffcefece0b53b2ed33655ef8b7b09f337 /lib/libutil/pw_util.c
parentf8704b9d92f255282ae477eefb7c0691410f5aa9 (diff)
downloadFreeBSD-src-f514349f09ea64c630ed12ee1b79a2f09fa14d96.zip
FreeBSD-src-f514349f09ea64c630ed12ee1b79a2f09fa14d96.tar.gz
Correctly detect the case where a password entry was changed while we were
preparing to edit it. PR: bin/50563
Diffstat (limited to 'lib/libutil/pw_util.c')
-rw-r--r--lib/libutil/pw_util.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 053ac56..73d544b 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -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 */
OpenPOWER on IntegriCloud