diff options
| author | James Peach <jpeach@samba.org> | 2007-05-23 20:31:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:45 -0500 |
| commit | f4ae28576376741a5402a286827a46c053db0ff7 (patch) | |
| tree | ea00880459b82e677e2eb38ebc5dcc608d5e053a /source3/pam_smbpass | |
| parent | b683f8137baa6d7d4ddb6db6fe4f7b2141abd071 (diff) | |
| download | samba-f4ae28576376741a5402a286827a46c053db0ff7.tar.gz samba-f4ae28576376741a5402a286827a46c053db0ff7.tar.bz2 samba-f4ae28576376741a5402a286827a46c053db0ff7.zip | |
r23095: Support systems that have their PAM headers in /usr/include/pam.
(This used to be commit f1e8de4b576b3954d456cb64c02417908bab8da4)
Diffstat (limited to 'source3/pam_smbpass')
| -rw-r--r-- | source3/pam_smbpass/general.h | 8 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_acct.c | 8 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_auth.c | 8 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_passwd.c | 8 |
4 files changed, 32 insertions, 0 deletions
diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h index f84c254444..d3afb4c1fc 100644 --- a/source3/pam_smbpass/general.h +++ b/source3/pam_smbpass/general.h @@ -1,9 +1,17 @@ #ifndef LINUX /* This is only needed by modules in the Sun implementation. */ +#if defined(HAVE_SECURITY_PAM_APPL_H) #include <security/pam_appl.h> +#elif defined(HAVE_PAM_PAM_APPL_H) +#include <pam/pam_appl.h> +#endif #endif /* LINUX */ +#if defined(HAVE_SECURITY_PAM_MODULES_H) #include <security/pam_modules.h> +#elif defined(HAVE_PAM_PAM_MODULES_H) +#include <pam/pam_modules.h> +#endif #ifndef PAM_AUTHTOK_RECOVER_ERR #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR diff --git a/source3/pam_smbpass/pam_smb_acct.c b/source3/pam_smbpass/pam_smb_acct.c index 47bf059479..f3b20465ab 100644 --- a/source3/pam_smbpass/pam_smb_acct.c +++ b/source3/pam_smbpass/pam_smb_acct.c @@ -23,11 +23,19 @@ #ifndef LINUX /* This is only used in the Sun implementation. */ +#if defined(HAVE_SECURITY_PAM_APPL_H) #include <security/pam_appl.h> +#elif defined(HAVE_PAM_PAM_APPL_H) +#include <pam/pam_appl.h> +#endif #endif /* LINUX */ +#if defined(HAVE_SECURITY_PAM_MODULES_H) #include <security/pam_modules.h> +#elif defined(HAVE_PAM_PAM_MODULES_H) +#include <pam/pam_modules.h> +#endif #include "general.h" diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index df6d20e01a..ceb23c3633 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -24,11 +24,19 @@ #ifndef LINUX /* This is only used in the Sun implementation. */ +#if defined(HAVE_SECURITY_PAM_APPL_H) #include <security/pam_appl.h> +#elif defined(HAVE_PAM_PAM_APPL_H) +#include <pam/pam_appl.h> +#endif #endif /* LINUX */ +#if defined(HAVE_SECURITY_PAM_MODULES_H) #include <security/pam_modules.h> +#elif defined(HAVE_PAM_PAM_MODULES_H) +#include <pam/pam_modules.h> +#endif #include "general.h" diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index 79bcfb6ff0..cffee74562 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -29,10 +29,18 @@ and others (including FreeBSD). */ #ifndef LINUX +#if defined(HAVE_SECURITY_PAM_APPL_H) #include <security/pam_appl.h> +#elif defined(HAVE_PAM_PAM_APPL_H) +#include <pam/pam_appl.h> +#endif #endif +#if defined(HAVE_SECURITY_PAM_MODULES_H) #include <security/pam_modules.h> +#elif defined(HAVE_PAM_PAM_MODULES_H) +#include <pam/pam_modules.h> +#endif #include "general.h" |