diff options
| author | Jeremy Allison <jra@samba.org> | 2001-05-01 17:19:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-05-01 17:19:58 +0000 |
| commit | f2df6c92ea4a5905e83d56ec32d9e88500833cc5 (patch) | |
| tree | 40a4641f65625ce10ce3759b584b54eb5e7904e4 | |
| parent | 40f75304b29b3b02e8473ba47ec8a93ed947338b (diff) | |
| download | samba-f2df6c92ea4a5905e83d56ec32d9e88500833cc5.tar.gz samba-f2df6c92ea4a5905e83d56ec32d9e88500833cc5.tar.xz samba-f2df6c92ea4a5905e83d56ec32d9e88500833cc5.zip | |
Added Andrew Bartlett's fixes to my changes to his original patch (at the
court of king caractacus, was just passing by... :-).
Jeremy.
| -rw-r--r-- | source/auth/pampass.c | 4 | ||||
| -rw-r--r-- | source/auth/pass_check.c | 2 | ||||
| -rw-r--r-- | source/passdb/pampass.c | 4 | ||||
| -rw-r--r-- | source/passdb/pass_check.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source/auth/pampass.c b/source/auth/pampass.c index 09b84db71ac..061e5ee0bf1 100644 --- a/source/auth/pampass.c +++ b/source/auth/pampass.c @@ -664,9 +664,9 @@ uint32 smb_pam_passcheck(char * user, char * password) */ if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, password, NULL)) == NULL) - return False; + return NT_STATUS_LOGON_FAILURE; - if (!smb_pam_start(&pamh, user, NULL, NULL)) + if (!smb_pam_start(&pamh, user, NULL, pconv)) return NT_STATUS_LOGON_FAILURE; if ((nt_status = smb_pam_auth(pamh, user)) != NT_STATUS_NOPROBLEMO) { diff --git a/source/auth/pass_check.c b/source/auth/pass_check.c index 05f7138c3c7..9424189b236 100644 --- a/source/auth/pass_check.c +++ b/source/auth/pass_check.c @@ -599,7 +599,7 @@ static BOOL password_check(char *password) { #ifdef WITH_PAM - return (smb_pam_passcheck(this_user, password)); + return (smb_pam_passcheck(this_user, password) == NT_STATUS_NOPROBLEMO); #endif /* WITH_PAM */ #ifdef WITH_AFS diff --git a/source/passdb/pampass.c b/source/passdb/pampass.c index 09b84db71ac..061e5ee0bf1 100644 --- a/source/passdb/pampass.c +++ b/source/passdb/pampass.c @@ -664,9 +664,9 @@ uint32 smb_pam_passcheck(char * user, char * password) */ if ((pconv = smb_setup_pam_conv(smb_pam_conv, user, password, NULL)) == NULL) - return False; + return NT_STATUS_LOGON_FAILURE; - if (!smb_pam_start(&pamh, user, NULL, NULL)) + if (!smb_pam_start(&pamh, user, NULL, pconv)) return NT_STATUS_LOGON_FAILURE; if ((nt_status = smb_pam_auth(pamh, user)) != NT_STATUS_NOPROBLEMO) { diff --git a/source/passdb/pass_check.c b/source/passdb/pass_check.c index 05f7138c3c7..9424189b236 100644 --- a/source/passdb/pass_check.c +++ b/source/passdb/pass_check.c @@ -599,7 +599,7 @@ static BOOL password_check(char *password) { #ifdef WITH_PAM - return (smb_pam_passcheck(this_user, password)); + return (smb_pam_passcheck(this_user, password) == NT_STATUS_NOPROBLEMO); #endif /* WITH_PAM */ #ifdef WITH_AFS |