aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartekgola@gmail.com>2014-02-11 21:31:42 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2014-02-19 18:53:25 +0100
commit265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2 (patch)
tree6fe465dd9760a9e7a1864f1e46f5457bd2b3a50a
parentffc3a93d0dbf4ac887f528c0495cd586a092d88f (diff)
downloadbusybox-w32-265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2.tar.gz
busybox-w32-265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2.tar.bz2
busybox-w32-265a74b9834cfe8a9d25ce1cf4d4db509f9a44f2.zip
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 2c4be2e9f..38d4ebc26 100644
--- a/Config.in
+++ b/Config.in
@@ -257,6 +257,13 @@ config UNICODE_PRESERVE_BROKEN
257 at shell prompt will list file named 0xff (single char name 257 at shell prompt will list file named 0xff (single char name
258 with char value 255), not file named '?'. 258 with char value 255), not file named '?'.
259 259
260config PAM
261 bool "Support for PAM (Pluggable Authentication Modules)"
262 default n
263 help
264 Use PAM in some busybox applets (currently login and httpd) instead
265 of direct access to password database.
266
260config LONG_OPTS 267config LONG_OPTS
261 bool "Support for --long-options" 268 bool "Support for --long-options"
262 default y 269 default y
diff --git a/loginutils/Config.src b/loginutils/Config.src
index b78d7c38e..fa2b4f8c0 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -223,13 +223,6 @@ config LOGIN_SESSION_AS_CHILD
223 almost always would want this to be set to Y, else PAM session 223 almost always would want this to be set to Y, else PAM session
224 will not be cleaned up. 224 will not be cleaned up.
225 225
226config PAM
227 bool "Support for PAM (Pluggable Authentication Modules)"
228 default n
229 depends on LOGIN
230 help
231 Use PAM in login(1) instead of direct access to password database.
232
233config LOGIN_SCRIPTS 226config LOGIN_SCRIPTS
234 bool "Support for login scripts" 227 bool "Support for login scripts"
235 depends on LOGIN 228 depends on LOGIN