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 | |
| 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')
| -rw-r--r-- | source3/nsswitch/winbindd.c | 6 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index 4f161604b5..4b47ac13a2 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -452,7 +452,7 @@ void winbind_client_read(struct winbindd_cli_state *state) (char *)&state->request, sizeof(state->request) - state->read_buf_len); - DEBUG(10,("client_read: read %d bytes. Need %d more for a full request.\n", n, sizeof(state->request) - n - state->read_buf_len )); + DEBUG(10,("client_read: read %d bytes. Need %ld more for a full request.\n", n, (unsigned long)(sizeof(state->request) - n - state->read_buf_len) )); /* Read failed, kill client */ @@ -719,8 +719,8 @@ static void process_loop(void) if (state->read_buf_len >= sizeof(uint32) && *(uint32 *) &state->request != sizeof(state->request)) { - DEBUG(0,("process_loop: Invalid request size from pid %lu: %d bytes sent, should be %d\n", - (unsigned long)state->request.pid, *(uint32 *) &state->request, sizeof(state->request))); + DEBUG(0,("process_loop: Invalid request size from pid %lu: %d bytes sent, should be %ld\n", + (unsigned long)state->request.pid, *(uint32 *) &state->request, (unsigned long)sizeof(state->request))); remove_client(state); break; 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); |