diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-18 20:04:42 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-18 20:04:42 -0400 |
| commit | 7e4de49bfceed18c81abf93703a61d0a22617a24 (patch) | |
| tree | 37b74b75d0edcfe28ce4d9898c0889a74b262492 /nsswitch/pam_winbind.c | |
| parent | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (diff) | |
| parent | 27aece72004a84a6e0b2e00987d8a362e307d1d8 (diff) | |
| download | samba-7e4de49bfceed18c81abf93703a61d0a22617a24.tar.gz samba-7e4de49bfceed18c81abf93703a61d0a22617a24.tar.bz2 samba-7e4de49bfceed18c81abf93703a61d0a22617a24.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'nsswitch/pam_winbind.c')
| -rw-r--r-- | nsswitch/pam_winbind.c | 10 |
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; } |