summaryrefslogtreecommitdiff
path: root/source3/client
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/client
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/client')
-rw-r--r--source3/client/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 27f120ce9a..94dc52d9d5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3711,7 +3711,7 @@ static void readline_callback(void)
session keepalives and then drop them here.
*/
if (FD_ISSET(cli->fd,&fds)) {
- if (!receive_smb(cli->fd,cli->inbuf,0)) {
+ if (!receive_smb(cli->fd,cli->inbuf,0,&cli->smb_rw_error)) {
DEBUG(0, ("Read from server failed, maybe it closed the "
"connection\n"));
return;