diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 23:31:59 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 23:31:59 +0000 |
| commit | de9ec929586fd88d1efbaea3f6cf5bf5b57d391f (patch) | |
| tree | 59add578b824dd91330e04ccd52256ec9d6144fb /libbb | |
| parent | ce97960a6e7da4d9fc7a003c9138aec5e4e55a96 (diff) | |
| download | busybox-w32-de9ec929586fd88d1efbaea3f6cf5bf5b57d391f.tar.gz busybox-w32-de9ec929586fd88d1efbaea3f6cf5bf5b57d391f.tar.bz2 busybox-w32-de9ec929586fd88d1efbaea3f6cf5bf5b57d391f.zip | |
usage.h: fix compile-time bugs exposed by previous change
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/pw_encrypt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index d6b2fe28d..f6085f3d2 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c | |||
| @@ -11,13 +11,12 @@ | |||
| 11 | #include <string.h> | 11 | #include <string.h> |
| 12 | #include <crypt.h> | 12 | #include <crypt.h> |
| 13 | 13 | ||
| 14 | |||
| 15 | char *pw_encrypt(const char *clear, const char *salt) | 14 | char *pw_encrypt(const char *clear, const char *salt) |
| 16 | { | 15 | { |
| 17 | static char cipher[128]; | 16 | static char cipher[128]; |
| 18 | char *cp; | 17 | char *cp; |
| 19 | 18 | ||
| 20 | #ifdef CONFIG_FEATURE_SHA1_PASSWORDS | 19 | #if 0 /* was CONFIG_FEATURE_SHA1_PASSWORDS, but there is no such thing??? */ |
| 21 | if (strncmp(salt, "$2$", 3) == 0) { | 20 | if (strncmp(salt, "$2$", 3) == 0) { |
| 22 | return sha1_crypt(clear); | 21 | return sha1_crypt(clear); |
| 23 | } | 22 | } |
| @@ -29,4 +28,3 @@ char *pw_encrypt(const char *clear, const char *salt) | |||
| 29 | safe_strncpy(cipher, cp, sizeof(cipher)); | 28 | safe_strncpy(cipher, cp, sizeof(cipher)); |
| 30 | return cipher; | 29 | return cipher; |
| 31 | } | 30 | } |
| 32 | |||