diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-05 11:12:56 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-05 11:12:56 -0800 |
| commit | 36441da4240f3e3a296eed65f0796b25b7b05a3a (patch) | |
| tree | 3399982fb4f83b11d5b1258a49ea1b78725bb832 /source3/nmbd/asyncdns.c | |
| parent | 8f13ba45686f0f8c3415143246fba44e81fe8a73 (diff) | |
| download | samba-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/nmbd/asyncdns.c')
| -rw-r--r-- | source3/nmbd/asyncdns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c index b9c9ffb1c6..33c1cb6cb1 100644 --- a/source3/nmbd/asyncdns.c +++ b/source3/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; |