diff options
| author | des <des@FreeBSD.org> | 2002-05-08 14:52:32 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-05-08 14:52:32 +0000 |
| commit | 0e558b0a7ad81a51fbc32bf83949e33c5d8be066 (patch) | |
| tree | 0d0ec2cc2733b31418ecd5be1905fb34c1d06b9e /lib/libutil/pw_util.c | |
| parent | cb605d93795e1d3121c14ee05f65558747921273 (diff) | |
| download | FreeBSD-src-0e558b0a7ad81a51fbc32bf83949e33c5d8be066.zip FreeBSD-src-0e558b0a7ad81a51fbc32bf83949e33c5d8be066.tar.gz | |
If no old_pw was passed to pw_copy, compare just the name.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'lib/libutil/pw_util.c')
| -rw-r--r-- | lib/libutil/pw_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c index e28f3c9..72c47230 100644 --- a/lib/libutil/pw_util.c +++ b/lib/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) |
