diff options
| author |   Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-07-23 00:10:41 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-07-23 00:10:41 +0200 |
| commit | 3796c7ec045e786ec8f706e607b2f326d1cd626d (patch) | |
| tree | 39945bf9bfcce5458f2e4cc23900a4996ce16411 | |
| parent | Rename chain support to SUPPORT_$MODULE_$CHAIN (diff) | |
| download | pambase-3796c7ec045e786ec8f706e607b2f326d1cd626d.tar.gz pambase-3796c7ec045e786ec8f706e607b2f326d1cd626d.tar.bz2 pambase-3796c7ec045e786ec8f706e607b2f326d1cd626d.zip | |
Make it optional for pam_nologin to support auth.pambase-20080723
In FreeBSD 7, the pam_nologin module changed from being an
authentication module to an account module. In Linux-PAM it's
both. For this reasn make it optional for the two types of chains to
be used with pam_nologin.
This should close bug #232669 entirely.
| -rw-r--r-- | linux-pam-conf | 1 | ||||
| -rw-r--r-- | openpam-conf | 8 | ||||
| -rw-r--r-- | system-login.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/linux-pam-conf b/linux-pam-conf index 0ba9db7..44087d8 100644 --- a/linux-pam-conf +++ b/linux-pam-conf @@ -7,6 +7,7 @@ #define HAVE_MAIL 1 #define SUPPORT_UNIX_SESSION 1 #define SUPPORT_NOLOGIN_ACCOUNT 1 +#define SUPPORT_NOLOGIN_AUTH 1 #define UNIX_EXTENDED_ENCRYPTION md5 shadow diff --git a/openpam-conf b/openpam-conf index 83b682d..8c384d5 100644 --- a/openpam-conf +++ b/openpam-conf @@ -12,9 +12,13 @@ # endif # if __FreeBSD__ < 7 -# define SUPPORT_UNIX_SESSION 1 +# define SUPPORT_UNIX_SESSION 1 +# define SUPPORT_NOLOGIN_ACCOUNT 1 +# define SUPPORT_NOLOGIN_AUTH 0 # else -# define SUPPORT_UNIX_SESSION 0 +# define SUPPORT_UNIX_SESSION 0 +# define SUPPORT_NOLOGIN_ACCOUNT 0 +# define SUPPORT_NOLOGIN_AUTH 1 # endif #endif diff --git a/system-login.in b/system-login.in index 09af7e7..fb04a98 100644 --- a/system-login.in +++ b/system-login.in @@ -4,7 +4,9 @@ auth required pam_tally.so file=/var/log/faillog onerr=succeed DEBUG #if HAVE_SHELLS auth required pam_shells.so DEBUG #endif +#if SUPPORT_NOLOGIN_AUTH auth required pam_nologin.so DEBUG_NOLOGIN +#endif auth include system-auth #if HAVE_GNOME_KEYRING auth optional pam_gnome_keyring.so |