aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-09-27 23:31:59 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-09-27 23:31:59 +0000
commitede88e7a5065cac3e03d4d34c83d0dfa414453b4 (patch)
tree59add578b824dd91330e04ccd52256ec9d6144fb /libbb
parent6f51fea61200dc423e34bbdefa86b7101a221a35 (diff)
downloadbusybox-w32-ede88e7a5065cac3e03d4d34c83d0dfa414453b4.tar.gz
busybox-w32-ede88e7a5065cac3e03d4d34c83d0dfa414453b4.tar.bz2
busybox-w32-ede88e7a5065cac3e03d4d34c83d0dfa414453b4.zip
usage.h: fix compile-time bugs exposed by previous change
git-svn-id: svn://busybox.net/trunk/busybox@16243 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/pw_encrypt.c4
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
15char *pw_encrypt(const char *clear, const char *salt) 14char *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