Changeset 988 for vendor/current/source3/nmbd/asyncdns.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/nmbd/asyncdns.c (modified) (9 diffs)

vendor/current/source3/nmbd/asyncdns.c

@@ -3 +3 @@
    a async DNS handler
    Copyright (C) Andrew Tridgell 1997-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -20 +20 @@
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "lib/util/sys_rw_data.h"
 
 /***************************************************************************
@@ -31 +32 @@
 
         pull_ascii_nstring(qname, sizeof(qname), question->name);
-  
+
         if (!addr.s_addr) {
                 /* add the fail to WINS cache of names. give it 1 hour in the cache */
@@ -91 +92 @@
                 NTSTATUS status;
 
-                status = read_data(fd_in, (char *)&r, sizeof(r));
+                status = read_data_ntstatus(fd_in, (char *)&r, sizeof(r));
 
                 if (!NT_STATUS_IS_OK(status)) {
@@ -136 +137 @@
   create a child process to handle DNS lookups
   ****************************************************************************/
-void start_async_dns(void)
+void start_async_dns(struct messaging_context *msg)
 {
         int fd1[2], fd2[2];
@@ -148 +149 @@
         }
 
-        child_pid = sys_fork();
+        child_pid = fork();
 
         if (child_pid) {
@@ -167 +168 @@
         CatchSignal(SIGTERM, sig_term);
 
-        status = reinit_after_fork(nmbd_messaging_context(),
-                                   nmbd_event_context(),
-                                   procid_self(), true);
+        status = reinit_after_fork(msg, nmbd_event_context(), true, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -206 +205 @@
   check the DNS queue
   ****************************************************************************/
-void run_dns_queue(void)
+void run_dns_queue(struct messaging_context *msg)
 {
         struct query_record r;
@@ -219 +218 @@
                 close(fd_in);
                 close(fd_out);
-                start_async_dns();
-        }
-
-        status = read_data(fd_in, (char *)&r, sizeof(r));
+                start_async_dns(msg);
+        }
+
+        status = read_data_ntstatus(fd_in, (char *)&r, sizeof(r));
 
         if (!NT_STATUS_IS_OK(status)) {