Only do a full pwd_mkdb for deletions; other operations may use the -u

option as an optimization.

PR:	13346
Submitted by:	Neil Blakey-Milner <nbm@rucus.ru.ac.za>

1 files changed, 6 insertions, 2 deletions

diff --git a/pw/pwupd.c b/pw/pwupd.c
index 05fb087..10a6066 100644
--- a/pw/pwupd.c
+++ b/pw/pwupd.c
@@ -168,8 +168,12 @@ pw_update(struct passwd * pwd, char const * user, int mode)
 			 */
 			if (pwd != NULL)
 				fmtpwentry(pwbuf, pwd, PWF_MASTER);
-			if ((rc = fileupdate(getpwpath(_MASTERPASSWD), 0644, pwbuf, pfx, l, mode)) != 0)
-				rc = pwdb(NULL) == 0;
+			if ((rc = fileupdate(getpwpath(_MASTERPASSWD), 0644, pwbuf, pfx, l, mode)) != 0) {
+				if (mode == UPD_DELETE)
+					rc = pwdb(NULL) == 0;
+				else
+					rc = pwdb("-u", user, NULL) == 0;
+			}
 		}
 	}
 	return rc;