s3: Remove a bunch of calls to procid_self()

[samba.git] / source3 / nmbd / asyncdns.c

diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index 33c1cb6cb11436cec3c0993eb91ef221e6bb1aaa..0edec372cd4d31b10d78b15707148284b238994c 100644 (file)
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -18,6 +18,7 @@
    */
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 /***************************************************************************
   Add a DNS result to the name cache.
@@ -87,8 +88,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);
@@ -132,6 +138,7 @@ void kill_async_dns_child(void)
 void start_async_dns(void)
 {
        int fd1[2], fd2[2];
+       NTSTATUS status;
 
        CatchChild();
 
@@ -157,7 +164,16 @@ void start_async_dns(void)
        CatchSignal(SIGUSR2, SIG_IGN);
        CatchSignal(SIGUSR1, SIG_IGN);
        CatchSignal(SIGHUP, SIG_IGN);
-        CatchSignal(SIGTERM, SIGNAL_CAST sig_term );
+        CatchSignal(SIGTERM, sig_term);
+
+       status = reinit_after_fork(nmbd_messaging_context(),
+                                  nmbd_event_context(),
+                                  true);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("reinit_after_fork() failed\n"));
+               smb_panic("reinit_after_fork() failed");
+       }
 
        asyncdns_process();
 }
@@ -194,31 +210,25 @@ 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;
 
-        /* Allow SIGTERM to kill us. */
-        BlockSignals(False, SIGTERM);
-
        if (!process_exists_by_pid(child_pid)) {
                close(fd_in);
                close(fd_out);
                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;
-               }
-                BlockSignals(True, SIGTERM);
+       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;
                return;
        }
 
-        BlockSignals(True, SIGTERM);
-
        namerec = add_dns_result(&r.name, r.result);
 
        if (dns_current) {
@@ -253,13 +263,8 @@ void run_dns_queue(void)
                        in_dns = 0;
                        p->locked = False;
 
-                       if (p->prev)
-                               p->prev->next = p->next;
-                       else
-                               dns_queue = p->next;
-                       if (p->next)
-                               p->next->prev = p->prev;
                        p2 = p->next;
+                       DLIST_REMOVE(dns_queue, p);
                        free_packet(p);
                        p = p2;
                } else {
@@ -269,10 +274,7 @@ void run_dns_queue(void)
 
        if (dns_queue) {
                dns_current = dns_queue;
-               dns_queue = dns_queue->next;
-               if (dns_queue)
-                       dns_queue->prev = NULL;
-               dns_current->next = NULL;
+               DLIST_REMOVE(dns_queue, dns_queue);
 
                if (!write_child(dns_current)) {
                        DEBUG(3,("failed to send DNS query to child!\n"));
@@ -299,11 +301,7 @@ bool queue_dns_query(struct packet_struct *p,struct nmb_name *question)
                p->locked = True;
        } else {
                p->locked = True;
-               p->next = dns_queue;
-               p->prev = NULL;
-               if (p->next)
-                       p->next->prev = p;
-               dns_queue = p;
+               DLIST_ADD(dns_queue, p);
        }
 
        DEBUG(3,("added DNS query for %s\n", nmb_namestr(question)));
@@ -327,14 +325,8 @@ bool queue_dns_query(struct packet_struct *p,struct nmb_name *question)
 
        DEBUG(3,("DNS search for %s - ", nmb_namestr(question)));
 
-        /* Unblock TERM signal so we can be killed in DNS lookup. */
-        BlockSignals(False, SIGTERM);
-
        dns_ip.s_addr = interpret_addr(qname);
 
-        /* Re-block TERM signal. */
-        BlockSignals(True, SIGTERM);
-
        namerec = add_dns_result(question, dns_ip);
        if(namerec == NULL) {
                send_wins_name_query_response(NAM_ERR, p, NULL);