From e45930e8903cd80de149d6e92f05b8a3f80669cf Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Thu, 4 Dec 2008 12:05:26 +0000
Subject: Fold mkpasswd applet into cryptpw. mkpasswd is in Debian, OTOH
 cryptpw was added to busybox earlier. Trying to make both camps happy by
 making those two applets just aliases. They are command-line compatible. We
 can decide whether we want to drop one (and which one) later.

function                                             old     new   delta
cryptpw_main                                         183     314    +131
static.methods                                        21       -     -21
packed_usage                                       25707   25648     -59
mkpasswd_main                                        307       -    -307
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 1/1 up/down: 131/-387)         Total: -256 bytes

---
 loginutils/Config.in | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'loginutils/Config.in')

diff --git a/loginutils/Config.in b/loginutils/Config.in
index 6efca7e..ddd0c80 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -242,22 +242,16 @@ config CRYPTPW
 	bool "cryptpw"
 	default n
 	help
-	  Applet for crypting a string.
+	  Encrypts the given password with the crypt(3) libc function
+	  using the given salt. Debian has this utility under mkpasswd
+	  name. Busybox provides mkpasswd as an alias for cryptpw.
 
 config CHPASSWD
 	bool "chpasswd"
 	default n
 	help
-	  chpasswd reads a file of user name and password pairs from
-	  standard input and uses this information to update a group of
-	  existing users.
-
-config MKPASSWD
-	bool "mkpasswd"
-	default n
-	help
-	  mkpasswd encrypts the given password with the crypt(3) libc function
-	  using the given salt.
+	  Reads a file of user name and password pairs from standard input
+	  and uses this information to update a group of existing users.
 
 config SU
 	bool "su"
-- 
cgit v1.1