sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-21 01:59:07 +03:00
Code

r21143: Fix wrong check for pam error codes for getpwnam and lookup winbind

Browse Source 
requests in pam_winbind (Bug #4094).

Inspired by fix from Lars Heete.

Guenther
This commit is contained in:
Günther Deschner 2007-02-05 14:34:12 +00:00 committed by Gerald (Jerry) Carter
parent e479a9c094
commit 88e2185d29
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/nsswitch/pam_winbind.c
View File

@ -444,21 +444,34 @@ static int pam_winbind_request(pam_handle_t * pamh, int ctrl,
close_sock();
/* Copy reply data from socket */
if (response->result != WINBINDD_OK) {
if (response->data.auth.pam_error != PAM_SUCCESS) {
_pam_log(pamh, ctrl, LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s",
response->data.auth.error_string,
pam_strerror(pamh, response->data.auth.pam_error),
response->data.auth.pam_error,
response->data.auth.nt_status_string);
return response->data.auth.pam_error;
} else {
_pam_log(pamh, ctrl, LOG_ERR, "request failed, but PAM error 0!");
return PAM_SERVICE_ERR;
}
if (response->result == WINBINDD_OK) {
return PAM_SUCCESS;
}
return PAM_SUCCESS;
/* no need to check for pam_error codes for getpwnam() */
switch (req_type) {
case WINBINDD_GETPWNAM:
case WINBINDD_LOOKUPNAME:
_pam_log(pamh, ctrl, LOG_ERR, "request failed: %s, NT error was %s",
response->data.auth.nt_status_string);
return PAM_USER_UNKNOWN;
default:
break;
}
if (response->data.auth.pam_error != PAM_SUCCESS) {
_pam_log(pamh, ctrl, LOG_ERR, "request failed: %s, PAM error was %s (%d), NT error was %s",
response->data.auth.error_string,
pam_strerror(pamh, response->data.auth.pam_error),
response->data.auth.pam_error,
response->data.auth.nt_status_string);
return response->data.auth.pam_error;
}
_pam_log(pamh, ctrl, LOG_ERR, "request failed, but PAM error 0!");
return PAM_SERVICE_ERR;
}
static int pam_winbind_request_log(pam_handle_t * pamh,