summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2006-09-27 23:31:59 +0000
committerDenis Vlasenko2006-09-27 23:31:59 +0000
commitde9ec929586fd88d1efbaea3f6cf5bf5b57d391f (patch)
tree59add578b824dd91330e04ccd52256ec9d6144fb
parentce97960a6e7da4d9fc7a003c9138aec5e4e55a96 (diff)
downloadbusybox-de9ec929586fd88d1efbaea3f6cf5bf5b57d391f.zip
busybox-de9ec929586fd88d1efbaea3f6cf5bf5b57d391f.tar.gz
usage.h: fix compile-time bugs exposed by previous change
-rw-r--r--include/usage.h15
-rw-r--r--libbb/pw_encrypt.c4
2 files changed, 8 insertions, 11 deletions
diff --git a/include/usage.h b/include/usage.h
index db60800..3c97446 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -412,17 +412,17 @@ USE_FEATURE_DATE_ISOFMT( \
#define deallocvt_trivial_usage \
"[N]"
#define deallocvt_full_usage \
- "Deallocate unused virtual terminal /dev/ttyN"
+ "Deallocate unused virtual terminal /dev/ttyN"
#define delgroup_trivial_usage \
"GROUP"
#define delgroup_full_usage \
- "Deletes group GROUP from the system"
+ "Deletes group GROUP from the system"
#define deluser_trivial_usage \
"USER"
#define deluser_full_usage \
- "Deletes user USER from the system"
+ "Deletes user USER from the system"
#define devfsd_trivial_usage \
"mntpnt [-v]" \
@@ -2146,8 +2146,7 @@ USE_FEATURE_MDEV_CONFIG( \
"changes the password for the current user.\n" \
"Options:\n" \
"\t-a\tDefine which algorithm shall be used for the password\n" \
- "\t\t\t(Choices: des, md5" \
- USE_FEATURE_SHA1_PASSWORDS(", sha1") ")\n" \
+ "\t\t\t(Choices: des, md5, sha1)\n" \
"\t-d\tDelete the password for the specified user account\n" \
"\t-l\tLocks (disables) the specified user account\n" \
"\t-u\tUnlocks (re-enables) the specified user account"
@@ -2408,9 +2407,9 @@ USE_FEATURE_MDEV_CONFIG( \
#define route_full_usage \
"Edit the kernel's routing tables.\n\n" \
"Options:\n" \
- "\t-n\t\tDont resolve names\n" \
- "\t-e\t\tDisplay other/more information\n" \
- "\t-A inet" USE_FEATURE_ROUTE_IPV6("{6}") "\tSelect address family"
+ "\t-n\tDont resolve names\n" \
+ "\t-e\tDisplay other/more information\n" \
+ "\t-A inet" USE_FEATURE_IPV6("{6}") "\tSelect address family"
#define rpm_trivial_usage \
"-i -q[ildc]p package.rpm"
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index d6b2fe2..f6085f3 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -11,13 +11,12 @@
#include <string.h>
#include <crypt.h>
-
char *pw_encrypt(const char *clear, const char *salt)
{
static char cipher[128];
char *cp;
-#ifdef CONFIG_FEATURE_SHA1_PASSWORDS
+#if 0 /* was CONFIG_FEATURE_SHA1_PASSWORDS, but there is no such thing??? */
if (strncmp(salt, "$2$", 3) == 0) {
return sha1_crypt(clear);
}
@@ -29,4 +28,3 @@ char *pw_encrypt(const char *clear, const char *salt)
safe_strncpy(cipher, cp, sizeof(cipher));
return cipher;
}
-