diff options
| author |   Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-07-23 00:01:23 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-07-23 00:01:23 +0200 |
| commit | 3c59a0f5fc49dc82a92732de6244dce648e3bd9f (patch) | |
| tree | 4e1170f8e2c85b7d512faf45f33c7ebdc6f5a1ae | |
| parent | Add support for pam_ssh module. (diff) | |
| download | pambase-3c59a0f5fc49dc82a92732de6244dce648e3bd9f.tar.gz pambase-3c59a0f5fc49dc82a92732de6244dce648e3bd9f.tar.bz2 pambase-3c59a0f5fc49dc82a92732de6244dce648e3bd9f.zip | |
Only enable session support for pam_unix when available.
This fixes bug #232669 for what concern pam_unix. The pam_unix module
shipped with FreeBSD 7 has no support for session management so cannot
be used for that.
| -rw-r--r-- | linux-pam-conf | 15 | ||||
| -rw-r--r-- | openpam-conf | 6 | ||||
| -rw-r--r-- | system-auth.in | 4 |
3 files changed, 17 insertions, 8 deletions
diff --git a/linux-pam-conf b/linux-pam-conf index ae2eeb7..70c9f0e 100644 --- a/linux-pam-conf +++ b/linux-pam-conf @@ -1,10 +1,11 @@ -#define HAVE_LIMITS 1 -#define HAVE_ENV 1 -#define HAVE_TALLY 1 -#define HAVE_ACCESS 1 -#define HAVE_SHELLS 1 -#define HAVE_MOTD 1 -#define HAVE_MAIL 1 +#define HAVE_LIMITS 1 +#define HAVE_ENV 1 +#define HAVE_TALLY 1 +#define HAVE_ACCESS 1 +#define HAVE_SHELLS 1 +#define HAVE_MOTD 1 +#define HAVE_MAIL 1 +#define HAVE_PAM_UNIX_SESSION 1 #define NOLOGIN_SUPPORTS_ACCOUNT 1 #define UNIX_EXTENDED_ENCRYPTION md5 shadow diff --git a/openpam-conf b/openpam-conf index 7cfd702..f576bac 100644 --- a/openpam-conf +++ b/openpam-conf @@ -11,4 +11,10 @@ # define DEBUG_NOLOGIN DEBUG # endif +# if __FreeBSD__ < 7 +# define HAVE_PAM_UNIX_SESSION 1 +# else +# define HAVE_PAM_UNIX_SESSION 0 +# endif + #endif diff --git a/system-auth.in b/system-auth.in index eeba9ac..2296f6f 100644 --- a/system-auth.in +++ b/system-auth.in @@ -28,5 +28,7 @@ session optional pam_mktemp.so #ifdef HAVE_PAM_SSH session optional pam_ssh.so #endif +#ifdef HAVE_PAM_UNIX_SESSION session required pam_unix.so DEBUG - +#endif + |