summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-05 11:12:56 -0800
committerJeremy Allison <jra@samba.org>2007-11-05 11:12:56 -0800
commit36441da4240f3e3a296eed65f0796b25b7b05a3a (patch)
tree3399982fb4f83b11d5b1258a49ea1b78725bb832 /source3/winbindd
parent8f13ba45686f0f8c3415143246fba44e81fe8a73 (diff)
downloadsamba-36441da4240f3e3a296eed65f0796b25b7b05a3a.tar.gz
samba-36441da4240f3e3a296eed65f0796b25b7b05a3a.tar.bz2
samba-36441da4240f3e3a296eed65f0796b25b7b05a3a.zip
Remove the horror that was the global smb_rw_error.
Each cli struct has it's own local copy of this variable, so use that in client code. In the smbd server, add one static to smbd/proccess.c and use that inside smbd. Fix a bunch of places where smb_rw_error could be set by calling read_data() in places where we weren't reading from the SMB client socket (ie. winbindd). Jeremy. (This used to be commit 255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db)
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd_dual.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index c96941531a..c15af710f4 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -44,7 +44,7 @@ static void child_read_request(struct winbindd_cli_state *state)
/* Read data */
len = read_data(state->sock, (char *)&state->request,
- sizeof(state->request));
+ sizeof(state->request), NULL);
if (len != sizeof(state->request)) {
DEBUG(len > 0 ? 0 : 3, ("Got invalid request length: %d\n", (int)len));
@@ -72,7 +72,7 @@ static void child_read_request(struct winbindd_cli_state *state)
state->request.extra_data.data[state->request.extra_len] = '\0';
len = read_data(state->sock, state->request.extra_data.data,
- state->request.extra_len);
+ state->request.extra_len, NULL);
if (len != state->request.extra_len) {
DEBUG(0, ("Could not read extra data\n"));