Removed version number from file header.

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

diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index 3d2d5303de2c27e692cc9ed1cb058c7a1fbf84fb..c5ff718836c0b90af7e6ad53e09780fd7cd7ce5e 100644 (file)
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -1,5 +1,5 @@
 /*
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
    a async DNS handler
    Copyright (C) Andrew Tridgell 1997-1998
    
@@ -20,8 +20,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
 /***************************************************************************
   Add a DNS result to the name cache.
 ****************************************************************************/
@@ -52,7 +50,7 @@ static struct name_record *add_dns_result(struct nmb_name *question, struct in_a
 #ifndef SYNC_DNS
 
 static int fd_in = -1, fd_out = -1;
-static int child_pid = -1;
+static pid_t child_pid = -1;
 static int in_dns;
 
 /* this is the structure that is passed between the parent and child */
@@ -110,11 +108,9 @@ static void asyncdns_process(void)
   WINS db that our parent is going to write.
  **************************************************************************** */
 
-static int sig_term(void)
+static void sig_term(int sig)
 {
   _exit(0);
-  /* Keep compiler happy.. */
-  return 0;
 }
 
 /***************************************************************************
@@ -135,29 +131,31 @@ void start_async_dns(void)
 {
        int fd1[2], fd2[2];
 
-       signal(SIGCLD, SIG_IGN);
+       CatchChild();
 
        if (pipe(fd1) || pipe(fd2)) {
+               DEBUG(0,("can't create asyncdns pipes\n"));
                return;
        }
 
-       child_pid = fork();
+       child_pid = sys_fork();
 
        if (child_pid) {
                fd_in = fd1[0];
                fd_out = fd2[1];
                close(fd1[1]);
                close(fd2[0]);
+               DEBUG(0,("started asyncdns process %d\n", (int)child_pid));
                return;
        }
 
        fd_in = fd2[0];
        fd_out = fd1[1];
 
-       signal(SIGUSR2, SIG_IGN);
-       signal(SIGUSR1, SIG_IGN);
-       signal(SIGHUP, SIG_IGN);
-        signal(SIGTERM, SIGNAL_CAST sig_term );
+       CatchSignal(SIGUSR2, SIG_IGN);
+       CatchSignal(SIGUSR1, SIG_IGN);
+       CatchSignal(SIGHUP, SIG_IGN);
+        CatchSignal(SIGTERM, SIGNAL_CAST sig_term );
 
        asyncdns_process();
 }
@@ -305,7 +303,7 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
                dns_queue = p;
        }
 
-       DEBUG(3,("added DNS query for %s\n", namestr(question)));
+       DEBUG(3,("added DNS query for %s\n", nmb_namestr(question)));
        return True;
 }
 
@@ -313,7 +311,7 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
 
 
 /***************************************************************************
-  we use this then we can't do async DNS lookups
+  we use this when we can't do async DNS lookups
   ****************************************************************************/
 BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
                     struct name_record **n)
@@ -321,7 +319,7 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question,
        char *qname = question->name;
        struct in_addr dns_ip;
 
-       DEBUG(3,("DNS search for %s - ", namestr(question)));
+       DEBUG(3,("DNS search for %s - ", nmb_namestr(question)));
 
         /* Unblock TERM signal so we can be killed in DNS lookup. */
         BlockSignals(False, SIGTERM);