summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartekgola@gmail.com>2014-02-11 20:31:42 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-02-19 17:53:25 (GMT)
commit265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2 (patch)
tree6fe465dd9760a9e7a1864f1e46f5457bd2b3a50a
parentffc3a93d0dbf4ac887f528c0495cd586a092d88f (diff)
downloadbusybox-265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2.tar.gz
busybox-265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2.tar.bz2
Kbuild: move CONFIG_PAM to general configuration
Currently CONFIG_PAM depends on CONFIG_LOGIN, but is used by the httpd applet too. This patch moves said option to general configuration, thus allowing to compile httpd with PAM support independently from login. Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Config.in7
-rw-r--r--loginutils/Config.src7
2 files changed, 7 insertions, 7 deletions
diff --git a/Config.in b/Config.in
index 2c4be2e..38d4ebc 100644
--- a/Config.in
+++ b/Config.in
@@ -257,6 +257,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
diff --git a/loginutils/Config.src b/loginutils/Config.src
index b78d7c3..fa2b4f8 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -223,13 +223,6 @@ config LOGIN_SESSION_AS_CHILD
almost always would want this to be set to Y, else PAM session
will not be cleaned up.
-config PAM
- bool "Support for PAM (Pluggable Authentication Modules)"
- default n
- depends on LOGIN
- help
- Use PAM in login(1) instead of direct access to password database.
-
config LOGIN_SCRIPTS
bool "Support for login scripts"
depends on LOGIN