summaryrefslogtreecommitdiffstats
path: root/source/winbindd/winbindd_dual.c
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
commit255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db (patch)
treebf41e986c53b419b97c8eb02c60a99b6996aa01d /source/winbindd/winbindd_dual.c
parent5721a511d8dd327717bcd9c2053c4bd08f01185c (diff)
downloadsamba-255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db.tar.gz
samba-255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db.tar.xz
samba-255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db.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.
Diffstat (limited to 'source/winbindd/winbindd_dual.c')
-rw-r--r--source/winbindd/winbindd_dual.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index c96941531ac..c15af710f4d 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/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"));