sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

pam_winbind: Fix shadowing a global on FreeBSD

Browse Source 
FreeBSD defines a function pam_error()
This commit is contained in:
Volker Lendecke 2010-07-17 21:37:43 +02:00
parent 3c0e10d70c
commit bd54969d9b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nsswitch/pam_winbind.c
View File

@ -1432,12 +1432,12 @@ static void _pam_warn_krb5_failure(struct pwb_context *ctx,
static bool _pam_check_remark_auth_err(struct pwb_context *ctx,
const struct wbcAuthErrorInfo *e,
const char *nt_status_string,
int *pam_error)
int *pam_err)
{
const char *ntstatus = NULL;
const char *error_string = NULL;
if (!e || !pam_error) {
if (!e || !pam_err) {
return false;
}
@ -1451,18 +1451,18 @@ static bool _pam_check_remark_auth_err(struct pwb_context *ctx,
error_string = _get_ntstatus_error_string(nt_status_string);
if (error_string) {
_make_remark(ctx, PAM_ERROR_MSG, error_string);
*pam_error = e->pam_error;
*pam_err = e->pam_error;
return true;
}
if (e->display_string) {
_make_remark(ctx, PAM_ERROR_MSG, _(e->display_string));
*pam_error = e->pam_error;
*pam_err = e->pam_error;
return true;
}
_make_remark(ctx, PAM_ERROR_MSG, nt_status_string);
*pam_error = e->pam_error;
*pam_err = e->pam_error;
return true;
}