Shadow password support went beyond the dependency event horizon, just make

it an independent menu.  And make internal shadow password support a subset
of the other internal password function support.

1 files changed, 28 insertions, 32 deletions

diff --git a/loginutils/Config.in b/loginutils/Config.in
index a16412c8c..9aa6b4937 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -5,6 +5,34 @@
 
 menu "Login/Password Management Utilities"
 
+config CONFIG_FEATURE_SHADOWPASSWDS
+        bool "Support for shadow passwords"
+        default n
+        depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU || CONFIG_VLOCK
+        help
+          Build support for shadow password in /etc/shadow.  This file is only
+          readable by root and thus the encrypted passwords are no longer
+          publicly readable.
+
+config CONFIG_USE_BB_SHADOW
+#       bool "  Use busybox shadow password functions"
+        default y
+        depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS
+        help
+            If you leave this disabled, busybox will use the system's shadow
+            password handling functions.  And if you are using the GNU C library
+            (glibc), you will then need to install the /etc/nsswitch.conf
+            configuration file and the required /lib/libnss_* libraries in
+            order for the shadow password functions to work.  This generally
+            makes your embedded system quite a bit larger.
+
+            Enabling this option will cause busybox to directly access the
+            system's /etc/shadow file when handling shadow passwords.  This
+            makes your system smaller and I will get fewer emails asking about
+            how glibc NSS works).  When this option is enabled, you will not be
+            able to use PAM to access shadow passwords from remote LDAP
+            password servers and whatnot.
+
 config CONFIG_USE_BB_PWD_GRP
         bool "Use internal password and group functions rather than system functions"
         default n
@@ -26,7 +54,6 @@ config CONFIG_USE_BB_PWD_GRP
 
             If you enable this option, it will add about 1.5k to busybox.
 
-
 config CONFIG_ADDGROUP
         bool "addgroup"
         default n
@@ -133,36 +160,5 @@ config CONFIG_VLOCK
           Note that Busybox binary must be setuid root for this applet to
           work properly.
 
-comment "Common options for adduser, deluser, login, su, vlock"
-        depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU || CONFIG_VLOCK
-
-config CONFIG_FEATURE_SHADOWPASSWDS
-        bool "Support for shadow passwords"
-        default n
-        depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU || CONFIG_VLOCK
-        help
-          Build support for shadow password in /etc/shadow.  This file is only
-          readable by root and thus the encrypted passwords are no longer
-          publicly readable.
-
-config CONFIG_USE_BB_SHADOW
-        bool "  Use busybox shadow password functions"
-        default n
-        depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS
-        help
-            If you leave this disabled, busybox will use the system's shadow
-            password handling functions.  And if you are using the GNU C library
-            (glibc), you will then need to install the /etc/nsswitch.conf
-            configuration file and the required /lib/libnss_* libraries in
-            order for the shadow password functions to work.  This generally
-            makes your embedded system quite a bit larger.
-
-            Enabling this option will cause busybox to directly access the
-            system's /etc/shadow file when handling shadow passwords.  This
-            makes your system smaller and I will get fewer emails asking about
-            how glibc NSS works).  When this option is enabled, you will not be
-            able to use PAM to access shadow passwords from remote LDAP
-            password servers and whatnot.
-
 endmenu