diff options
| author | Günther Deschner <gd@samba.org> | 2007-05-24 20:26:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:47 -0500 |
| commit | 825c4ceffef31ac68747cba747df44e6f4b1a576 (patch) | |
| tree | 504375419a8da20d46745274a9e737e2c5bb9b06 /source3/pam_smbpass | |
| parent | f260b45d646ae69602f63c1f6a002384b4828a1c (diff) | |
| download | samba-825c4ceffef31ac68747cba747df44e6f4b1a576.tar.gz samba-825c4ceffef31ac68747cba747df44e6f4b1a576.tar.bz2 samba-825c4ceffef31ac68747cba747df44e6f4b1a576.zip | |
r23121: Fix Bug #2727 and let pam_smbpass at least link and dlopen correctly again.
Thanks to Bartlomiej Solarz-Niesluchowski <Bartlomiej.Solarz-Niesluchowski@wit.edu.pl>.
Guenther
(This used to be commit ba956ab8e4097d46bbad12caf2fad6857f463618)
Diffstat (limited to 'source3/pam_smbpass')
| -rw-r--r-- | source3/pam_smbpass/general.h | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_acct.c | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_auth.c | 2 | ||||
| -rw-r--r-- | source3/pam_smbpass/pam_smb_passwd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h index d3afb4c1fc..320bdd0cc8 100644 --- a/source3/pam_smbpass/general.h +++ b/source3/pam_smbpass/general.h @@ -121,7 +121,7 @@ static const SMB_Ctrls smb_args[SMB_CTRLS_] = { struct _pam_failed_auth { char *user; /* user that's failed to be authenticated */ - int id; /* uid of requested user */ + uid_t id; /* uid of requested user */ char *agent; /* attempt from user with name */ int count; /* number of failures so far */ }; diff --git a/source3/pam_smbpass/pam_smb_acct.c b/source3/pam_smbpass/pam_smb_acct.c index f3b20465ab..66e7301dae 100644 --- a/source3/pam_smbpass/pam_smb_acct.c +++ b/source3/pam_smbpass/pam_smb_acct.c @@ -81,7 +81,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags, /* Getting into places that might use LDAP -- protect the app from a SIGPIPE it's not expecting */ oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); - if (!initialize_password_db(True)) { + if (!initialize_password_db(True, NULL)) { _log_err( LOG_ALERT, "Cannot access samba password database" ); CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler); return PAM_AUTHINFO_UNAVAIL; diff --git a/source3/pam_smbpass/pam_smb_auth.c b/source3/pam_smbpass/pam_smb_auth.c index ceb23c3633..819918e144 100644 --- a/source3/pam_smbpass/pam_smb_auth.c +++ b/source3/pam_smbpass/pam_smb_auth.c @@ -109,7 +109,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, _log_err( LOG_DEBUG, "username [%s] obtained", name ); } - if (!initialize_password_db(True)) { + if (!initialize_password_db(True, NULL)) { _log_err( LOG_ALERT, "Cannot access samba password database" ); retval = PAM_AUTHINFO_UNAVAIL; AUTH_RETURN; diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index cffee74562..9f36bc11e4 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -137,7 +137,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, from a SIGPIPE it's not expecting */ oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); - if (!initialize_password_db(False)) { + if (!initialize_password_db(False, NULL)) { _log_err( LOG_ALERT, "Cannot access samba password database" ); CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler); return PAM_AUTHINFO_UNAVAIL; |