summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-17 21:37:43 +0200
committerVolker Lendecke <vl@samba.org>2010-07-17 21:48:35 +0200
commitbd54969d9bf970e29392856eb351ecf5a129daac (patch)
tree2752b858345cbba360bc4afbc17cb2fcaa2dde25
parent3c0e10d70c7f3b5f50269166d3c7f44e13157d5a (diff)
downloadsamba-bd54969d9bf970e29392856eb351ecf5a129daac.tar.gz
samba-bd54969d9bf970e29392856eb351ecf5a129daac.tar.bz2
samba-bd54969d9bf970e29392856eb351ecf5a129daac.zip
pam_winbind: Fix shadowing a global on FreeBSD
FreeBSD defines a function pam_error()
-rw-r--r--nsswitch/pam_winbind.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index b2d74dec4b..e651ce0e49 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -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;
}