From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Wed, 15 Sep 2004 02:39:09 +0000 (-0000)
Subject: Only write to shadow file is shadow passwords are enabled. Patch by magicfox modified... 
X-Git-Tag: 1_00~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=995d96a99d5f2d546d5e15b2614ae7408da27631;p=oweals%2Fbusybox.git

Only write to shadow file is shadow passwords are enabled. Patch by magicfox modified by myself to retain check for shadow file access.
---

diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 400ddb9a5..9c4b4ddfb 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -38,7 +38,6 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
 	char buffer[80];
 	char username[32];
 	char *pw_rest;
-	int has_shadow = 0;
 	int mask;
 	int continued;
 	FILE *fp;
@@ -46,12 +45,12 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
 	struct stat sb;
 	struct flock lock;
 
+#ifdef CONFIG_FEATURE_SHADOWPASSWDS
 	if (access(bb_path_shadow_file, F_OK) == 0) {
-		has_shadow = 1;
-	}
-	if (has_shadow) {
 		snprintf(filename, sizeof filename, "%s", bb_path_shadow_file);
-	} else {
+	} else
+#endif
+	{
 		snprintf(filename, sizeof filename, "%s", bb_path_passwd_file);
 	}