diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2004-09-15 02:39:09 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2004-09-15 02:39:09 +0000 |
commit | 995d96a99d5f2d546d5e15b2614ae7408da27631 (patch) | |
tree | a91ad6bc383a597f674d483040037c86a7c7b597 | |
parent | 240a91d8a17ba8168775de85dd91eebef8c243a6 (diff) | |
download | busybox-w32-995d96a99d5f2d546d5e15b2614ae7408da27631.tar.gz busybox-w32-995d96a99d5f2d546d5e15b2614ae7408da27631.tar.bz2 busybox-w32-995d96a99d5f2d546d5e15b2614ae7408da27631.zip |
Only write to shadow file is shadow passwords are enabled. Patch by magicfox modified by myself to retain check for shadow file access.
-rw-r--r-- | loginutils/passwd.c | 9 |
1 files changed, 4 insertions, 5 deletions
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) | |||
38 | char buffer[80]; | 38 | char buffer[80]; |
39 | char username[32]; | 39 | char username[32]; |
40 | char *pw_rest; | 40 | char *pw_rest; |
41 | int has_shadow = 0; | ||
42 | int mask; | 41 | int mask; |
43 | int continued; | 42 | int continued; |
44 | FILE *fp; | 43 | FILE *fp; |
@@ -46,12 +45,12 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw) | |||
46 | struct stat sb; | 45 | struct stat sb; |
47 | struct flock lock; | 46 | struct flock lock; |
48 | 47 | ||
48 | #ifdef CONFIG_FEATURE_SHADOWPASSWDS | ||
49 | if (access(bb_path_shadow_file, F_OK) == 0) { | 49 | if (access(bb_path_shadow_file, F_OK) == 0) { |
50 | has_shadow = 1; | ||
51 | } | ||
52 | if (has_shadow) { | ||
53 | snprintf(filename, sizeof filename, "%s", bb_path_shadow_file); | 50 | snprintf(filename, sizeof filename, "%s", bb_path_shadow_file); |
54 | } else { | 51 | } else |
52 | #endif | ||
53 | { | ||
55 | snprintf(filename, sizeof filename, "%s", bb_path_passwd_file); | 54 | snprintf(filename, sizeof filename, "%s", bb_path_passwd_file); |
56 | } | 55 | } |
57 | 56 | ||