svn commit: trunk/busybox: include libbb

[vda at busybox.net]

Author: vda
Date: 2006-09-27 16:31:59 -0700 (Wed, 27 Sep 2006)
New Revision: 16243

Log:
usage.h: fix compile-time bugs exposed by previous change


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/libbb/pw_encrypt.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2006-09-27 23:31:08 UTC (rev 16242)
+++ trunk/busybox/include/usage.h	2006-09-27 23:31:59 UTC (rev 16243)
@@ -412,17 +412,17 @@
 #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 @@
 	"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 @@
 #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"

Modified: trunk/busybox/libbb/pw_encrypt.c
===================================================================
--- trunk/busybox/libbb/pw_encrypt.c	2006-09-27 23:31:08 UTC (rev 16242)
+++ trunk/busybox/libbb/pw_encrypt.c	2006-09-27 23:31:59 UTC (rev 16243)
@@ -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 @@
 	safe_strncpy(cipher, cp, sizeof(cipher));
 	return cipher;
 }
-