pam_winbind: Fix shadowing a global on FreeBSD
authorVolker Lendecke <vl@samba.org>
Sat, 17 Jul 2010 19:37:43 +0000 (21:37 +0200)
committerVolker Lendecke <vl@samba.org>
Sat, 17 Jul 2010 19:48:35 +0000 (21:48 +0200)
FreeBSD defines a function pam_error()

nsswitch/pam_winbind.c

index b2d74dec4b18bae363b31a9ac0b4a3c9548a9b66..e651ce0e498796a4c78c2b640c316f8fcad53634 100644 (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;
        }