Changeset 745 for trunk/server/source3/nmbd/asyncdns.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/nmbd/asyncdns.c (modified) (6 diffs)

trunk/server/source3/nmbd/asyncdns.c

@@ -19 +19 @@
 
 #include "includes.h"
-
+#include "nmbd/nmbd.h"
 #ifdef __OS2__
 #define pipe(A) os2_pipe(A)
@@ -142 +142 @@
 {
         int fd1[2], fd2[2];
+        NTSTATUS status;
 
         CatchChild();
@@ -167 +168 @@
         CatchSignal(SIGUSR1, SIG_IGN);
         CatchSignal(SIGHUP, SIG_IGN);
-        CatchSignal(SIGTERM, SIGNAL_CAST sig_term );
-
-        if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(),
-                                               nmbd_event_context(), true))) {
+        CatchSignal(SIGTERM, sig_term);
+
+        status = reinit_after_fork(nmbd_messaging_context(),
+                                   nmbd_event_context(),
+                                   procid_self(), true);
+
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 smb_panic("reinit_after_fork() failed");
@@ -263 +267 @@
                         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;
@@ -279 +278 @@
         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)) {
@@ -309 +305 @@
         } 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);
         }