diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-26 10:39:21 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-02-02 11:03:23 +0100 |
| commit | b42a5d68a3ffd88fd60c64b6a75fe2d687d9c92d (patch) | |
| tree | b8e1b6e204742449977b1731649e99cfbd9da86a /source3/nmbd | |
| parent | 21e7344d2f45416ea996f88be72de1a923c0ee9c (diff) | |
| download | samba-b42a5d68a3ffd88fd60c64b6a75fe2d687d9c92d.tar.gz samba-b42a5d68a3ffd88fd60c64b6a75fe2d687d9c92d.tar.bz2 samba-b42a5d68a3ffd88fd60c64b6a75fe2d687d9c92d.zip | |
Convert read_data() to NTSTATUS
(This used to be commit af40b71023f8c4a2133d996ea698c72b97624043)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/asyncdns.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c index 33c1cb6cb1..5e5565991e 100644 --- a/source3/nmbd/asyncdns.c +++ b/source3/nmbd/asyncdns.c @@ -87,8 +87,13 @@ static void asyncdns_process(void) DEBUGLEVEL = -1; while (1) { - if (read_data(fd_in, (char *)&r, sizeof(r), NULL) != sizeof(r)) + NTSTATUS status; + + status = read_data(fd_in, (char *)&r, sizeof(r)); + + if (!NT_STATUS_IS_OK(status)) { break; + } pull_ascii_nstring( qname, sizeof(qname), r.name.name); r.result.s_addr = interpret_addr(qname); @@ -194,7 +199,7 @@ void run_dns_queue(void) struct query_record r; struct packet_struct *p, *p2; struct name_record *namerec; - int size; + NTSTATUS status; if (fd_in == -1) return; @@ -208,11 +213,11 @@ void run_dns_queue(void) start_async_dns(); } - 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; - } + status = read_data(fd_in, (char *)&r, sizeof(r)); + + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("read from child failed: %s\n", nt_errstr(status))); + fd_in = -1; BlockSignals(True, SIGTERM); return; } |