Merge branch 'busybox' into merge

1 files changed, 8 insertions, 4 deletions

diff --git a/Config.in b/Config.in
index 8c0e64988..c4b6f40bd 100644
--- a/Config.in
+++ b/Config.in
@@ -280,6 +280,13 @@ config UNICODE_PRESERVE_BROKEN
           at shell prompt will list file named 0xff (single char name
           with char value 255), not file named '?'.
 
+config PAM
+        bool "Support for PAM (Pluggable Authentication Modules)"
+        default n
+        help
+          Use PAM in some busybox applets (currently login and httpd) instead
+          of direct access to password database.
+
 config LONG_OPTS
         bool "Support for --long-options"
         default y
@@ -439,10 +446,7 @@ config SELINUX
           the option of compiling in SELinux applets.
 
           If you do not have a complete SELinux userland installed, this stuff
-          will not compile. Go visit
-                http://www.nsa.gov/selinux/index.html
-          to download the necessary stuff to allow busybox to compile with
-          this option enabled. Specifially, libselinux 1.28 or better is
+          will not compile.  Specifially, libselinux 1.28 or better is
           directly required by busybox. If the installation is located in a
           non-standard directory, provide it by invoking make as follows:
                 CFLAGS=-I<libselinux-include-path> \