diff options
| author |   Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-05-08 14:52:32 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-05-08 14:52:32 +0000 |
| commit | 39885fea466f2c6d648839abd52838e89fba1229 (patch) | |
| tree | 678908542c96d3cab76c8b8adf2ff63099b434e3 /libutil/pw_util.c | |
| parent | 5f1e46e5b9576b0b89577397396c3ada658c36cc (diff) | |
| download | pw-darwin-39885fea466f2c6d648839abd52838e89fba1229.tar.gz pw-darwin-39885fea466f2c6d648839abd52838e89fba1229.tar.zst pw-darwin-39885fea466f2c6d648839abd52838e89fba1229.zip | |
If no old_pw was passed to pw_copy, compare just the name.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'libutil/pw_util.c')
| -rw-r--r-- | libutil/pw_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libutil/pw_util.c b/libutil/pw_util.c index e28f3c9..72c4723 100644 --- a/libutil/pw_util.c +++ b/libutil/pw_util.c @@ -458,7 +458,8 @@ 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 == NULL || !pw_equal(pw, old_pw)) { + if ((old_pw && !pw_equal(fpw, old_pw)) || + (!old_pw && strcmp(fpw->pw_name, pw->pw_name))) { /* nope */ free(fpw); if (write(tfd, p, q - p + 1) != q - p + 1) |