diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-04-03 21:39:01 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-04-03 21:39:01 +0000 |
| commit | 6a0def755915f9cfa528625dc3899f4f939ba327 (patch) | |
| tree | ea4a693766618661e26b9e23a1c7610b6914c1d7 | |
| parent | 62ad2d800eabe5aa8451cab8c12828ccf5c7ff95 (diff) | |
| download | samba-6a0def755915f9cfa528625dc3899f4f939ba327.tar.gz samba-6a0def755915f9cfa528625dc3899f4f939ba327.tar.bz2 samba-6a0def755915f9cfa528625dc3899f4f939ba327.zip | |
More winbind for HPUX updates from Don Mccall. I think JRA has already
applied these to 2.2.
Andrew Bartlett
(This used to be commit 51fe3324dda6b1f9a9a45deda7a76b1fff35399a)
| -rw-r--r-- | source3/nsswitch/pam_winbind.c | 25 | ||||
| -rw-r--r-- | source3/nsswitch/winbind_nss_solaris.c | 6 |
2 files changed, 27 insertions, 4 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c index cad75f7907..b192a347f4 100644 --- a/source3/nsswitch/pam_winbind.c +++ b/source3/nsswitch/pam_winbind.c @@ -482,6 +482,27 @@ int pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, /* should not be reached */ return PAM_IGNORE; } +PAM_EXTERN +int pam_sm_open_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) +{ + /* parse arguments */ + int ctrl = _pam_parse(argc, argv); + if (ctrl & WINBIND_DEBUG_ARG) + _pam_log(LOG_DEBUG,"libpam_winbind:pam_sm_open_session handler"); + return PAM_SUCCESS; +} +PAM_EXTERN +int pam_sm_close_session(pam_handle_t *pamh, int flags, + int argc, const char **argv) +{ + /* parse arguments */ + int ctrl = _pam_parse(argc, argv); + if (ctrl & WINBIND_DEBUG_ARG) + _pam_log(LOG_DEBUG,"libpam_winbind:pam_sm_close_session handler"); + return PAM_SUCCESS; +} + PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags, @@ -650,8 +671,8 @@ struct pam_module _pam_winbind_modstruct = { pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt, - NULL, - NULL, + pam_sm_open_session, + pam_sm_close_session, pam_sm_chauthtok }; diff --git a/source3/nsswitch/winbind_nss_solaris.c b/source3/nsswitch/winbind_nss_solaris.c index 9c71c75e9d..8bf1487f5a 100644 --- a/source3/nsswitch/winbind_nss_solaris.c +++ b/source3/nsswitch/winbind_nss_solaris.c @@ -10,12 +10,14 @@ #include <sys/param.h> #include <string.h> #include <pwd.h> +#include "includes.h" #include <syslog.h> +#if !defined(HPUX) #include <sys/syslog.h> -#include "includes.h" +#endif /*hpux*/ #include "winbind_nss_config.h" -#ifdef HAVE_NSS_COMMON_H +#if defined(HAVE_NSS_COMMON_H) || defined(HPUX) #undef NSS_DEBUG |