diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-11-26 00:07:55 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-11-26 00:07:55 +0000 |
| commit | 52c1e60e68f8e906ce7c6a82b1c32f29cd546659 (patch) | |
| tree | 6947029f2acd3901377c2a525a905c845dfe02d5 /source3/nsswitch/winbindd_pam.c | |
| parent | e88d4705c1a22636d0aa4dcf5c56e0d3f842da16 (diff) | |
| download | samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.tar.gz samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.tar.bz2 samba-52c1e60e68f8e906ce7c6a82b1c32f29cd546659.zip | |
Merge from 3.0:
- NTLM2 fixes, don't force NTLM2
- Don't use NTLM2 for RPC, it doesn't work yet
- Add comments to winbindd_pam.c
- Merge 64 bit fixes and better debug messages in winbindd.c
Andrew Bartlett
(This used to be commit ba94e4a1ab6dc3335bbb29686ca6795d0ffad5b0)
Diffstat (limited to 'source3/nsswitch/winbindd_pam.c')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 993e7d68ff..9962105787 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -383,6 +383,8 @@ done: state->response.data.auth.nt_status = NT_STATUS_V(result); push_utf8_fstring(state->response.data.auth.nt_status_string, nt_errstr(result)); + + /* we might have given a more useful error above */ if (!*state->response.data.auth.error_string) push_utf8_fstring(state->response.data.auth.error_string, get_friendly_nt_error_msg(result)); state->response.data.auth.pam_error = nt_status_to_pam(result); |