From 39885fea466f2c6d648839abd52838e89fba1229 Mon Sep 17 00:00:00 2001 From: Dag-Erling Smørgrav Date: Wed, 8 May 2002 14:52:32 +0000 Subject: If no old_pw was passed to pw_copy, compare just the name. Sponsored by: DARPA, NAI Labs --- libutil/pw_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libutil/pw_util.c') 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) -- cgit v1.2.3-56-ge451