X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=blobdiff_plain;f=source%2Fnmbd%2Fasyncdns.c;h=99e697b470507797de5175191c377b2c509e12b7;hp=8f28f515eab146d07f760f3999a06110f9f4f381;hb=453a822a76780063dff23526c35408866d0c0154;hpb=03d343ddf5ef672afb3cf1fa65f86eb2c0a48772

diff --git a/source/nmbd/asyncdns.c b/source/nmbd/asyncdns.c
index 8f28f515eab..99e697b4705 100644
--- a/source/nmbd/asyncdns.c
+++ b/source/nmbd/asyncdns.c
@@ -52,7 +52,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 */
@@ -147,7 +147,7 @@ void start_async_dns(void)
 		fd_out = fd2[1];
 		close(fd1[1]);
 		close(fd2[0]);
-		DEBUG(0,("started asyncdns process %d\n", child_pid));
+		DEBUG(0,("started asyncdns process %d\n", (int)child_pid));
 		return;
 	}
 
@@ -305,7 +305,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 +313,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 +321,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);