Applied, thanks!
On Tue, Feb 11, 2014 at 9:31 PM, Bartosz Golaszewski <[email protected]> wrote: > 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 <[email protected]> > --- > Config.in | 7 +++++++ > loginutils/Config.src | 7 ------- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/Config.in b/Config.in > index 2c4be2e..f7735e1 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 > -- > 1.8.4.5 > > _______________________________________________ > busybox mailing list > [email protected] > http://lists.busybox.net/mailman/listinfo/busybox _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
