summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/pampass.c4
-rw-r--r--source3/passdb/pass_check.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pampass.c b/source3/passdb/pampass.c
index 09b84db71a..061e5ee0bf 100644
--- a/source3/passdb/pampass.c
+++ b/source3/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/source3/passdb/pass_check.c b/source3/passdb/pass_check.c
index 05f7138c3c..9424189b23 100644
--- a/source3/passdb/pass_check.c
+++ b/source3/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