summaryrefslogtreecommitdiff
path: root/source/nmbd
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/nmbd
parent5721a511d8dd327717bcd9c2053c4bd08f01185c (diff)
downloadsamba-255c2adf7b6ef30932b5bb9f142ccef4a5d3d0db.tar.gz
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/nmbd')
-rw-r--r--source/nmbd/asyncdns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/nmbd/asyncdns.c b/source/nmbd/asyncdns.c
index b9c9ffb1c66..33c1cb6cb11 100644
--- a/source/nmbd/asyncdns.c
+++ b/source/nmbd/asyncdns.c
@@ -87,7 +87,7 @@ static void asyncdns_process(void)
DEBUGLEVEL = -1;
while (1) {
- if (read_data(fd_in, (char *)&r, sizeof(r)) != sizeof(r))
+ if (read_data(fd_in, (char *)&r, sizeof(r), NULL) != sizeof(r))
break;
pull_ascii_nstring( qname, sizeof(qname), r.name.name);
@@ -208,7 +208,7 @@ void run_dns_queue(void)
start_async_dns();
}
- if ((size=read_data(fd_in, (char *)&r, sizeof(r))) != sizeof(r)) {
+ if ((size=read_data(fd_in, (char *)&r, sizeof(r), NULL)) != sizeof(r)) {
if (size) {
DEBUG(0,("Incomplete DNS answer from child!\n"));
fd_in = -1;