Changeset 745 for trunk/server/source3/nmbd/nmbd.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/nmbd.c (modified) (16 diffs)

trunk/server/source3/nmbd/nmbd.c

@@ -5 +5 @@
    Copyright (C) Jeremy Allison 1997-2002
    Copyright (C) Jelmer Vernooij 2002,2003 (Conversion to popt)
-   
+
    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/>.
-   
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "nmbd/nmbd.h"
+#include "serverid.h"
+#include "messages.h"
 
 int ClientNMB       = -1;
@@ -45 +49 @@
 struct event_context *nmbd_event_context(void)
 {
-        static struct event_context *ctx;
-
-        if (!ctx && !(ctx = event_context_init(NULL))) {
-                smb_panic("Could not init nmbd event context");
-        }
-        return ctx;
+        return server_event_context();
 }
 
 struct messaging_context *nmbd_messaging_context(void)
 {
-        static struct messaging_context *ctx;
-
-        if (ctx == NULL) {
-                ctx = messaging_init(NULL, server_id_self(),
-                                     nmbd_event_context());
-        }
-        if (ctx == NULL) {
-                DEBUG(0, ("Could not init nmbd messaging context.\n"));
-        }
-        return ctx;
+        struct messaging_context *msg_ctx = server_messaging_context();
+        if (likely(msg_ctx != NULL)) {
+                return msg_ctx;
+        }
+        smb_panic("Could not init nmbd's messaging context.\n");
+        return NULL;
 }
 
@@ -88 +83 @@
 
         gencache_stabilize();
+        serverid_deregister(procid_self());
 
         pidfile_unlink();
@@ -258 +254 @@
                 }
 
-                ip = ((struct sockaddr_in *)&iface->ip)->sin_addr;
-                nmask = ((struct sockaddr_in *)&iface->netmask)->sin_addr;
+                ip = ((struct sockaddr_in *)(void *)&iface->ip)->sin_addr;
+                nmask = ((struct sockaddr_in *)(void *)
+                         &iface->netmask)->sin_addr;
 
                 /*
@@ -267 +264 @@
                  */
 
-                if (is_loopback_addr((struct sockaddr *)&iface->ip)) {
+                if (is_loopback_addr((struct sockaddr *)(void *)&iface->ip)) {
                         DEBUG(2,("reload_interfaces: Ignoring loopback "
                                 "interface %s\n",
@@ -306 +303 @@
                                 continue;
                         }
-                        ip = ((struct sockaddr_in *)&iface->ip)->sin_addr;
-                        nmask = ((struct sockaddr_in *)&iface->netmask)->sin_addr;
+                        ip = ((struct sockaddr_in *)(void *)
+                              &iface->ip)->sin_addr;
+                        nmask = ((struct sockaddr_in *)(void *)
+                                 &iface->netmask)->sin_addr;
                         if (ip_equal_v4(ip, subrec->myip) &&
                             ip_equal_v4(nmask, subrec->mask_ip)) {
@@ -342 +341 @@
                  * cause us to exit.
                  */
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 /* We only count IPv4, non-loopback interfaces here. */
@@ -350 +349 @@
                 }
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
 
                 /*
@@ -447 +446 @@
 
         in_addr_to_sockaddr_storage(&ss, p->ip);
-        pss = iface_ip((struct sockaddr *)&ss);
+        pss = iface_ip((struct sockaddr *)(void *)&ss);
 
         if (pss == NULL) {
@@ -672 +671 @@
                 if (lp_enhanced_browsing())
                         sync_all_dmbs(t);
-
-                /*
-                 * clear the unexpected packet queue 
-                 */
-
-                clear_unexpected(t);
 
                 /* check for new network interfaces */
@@ -788 +781 @@
         { NULL }
         };
-        TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
+        TALLOC_CTX *frame;
+        NTSTATUS status;
+
+        /*
+         * Do this before any other talloc operation
+         */
+        talloc_enable_null_tracking();
+        frame = talloc_stackframe();
 
 #ifdef __OS2__
@@ -868 +868 @@
                 exit(1);
         }
-
-        setup_logging( argv[0], log_stdout );
+        if (log_stdout) {
+                setup_logging( argv[0], DEBUG_STDOUT);
+        } else {
+                setup_logging( argv[0], DEBUG_FILE);
+        }
 
         reopen_logs();
@@ -907 +910 @@
         if (is_daemon && !opt_interactive) {
                 DEBUG( 2, ( "Becoming a daemon.\n" ) );
-                become_daemon(Fork, no_process_group);
+                become_daemon(Fork, no_process_group, log_stdout);
         }
 
@@ -937 +940 @@
         pidfile_create("nmbd");
 
-        if (!NT_STATUS_IS_OK(reinit_after_fork(nmbd_messaging_context(),
-                                               nmbd_event_context(), false))) {
+        status = reinit_after_fork(nmbd_messaging_context(),
+                                   nmbd_event_context(),
+                                   procid_self(), false);
+
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);
@@ -949 +955 @@
 
         /* get broadcast messages */
-        claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP);
+
+        if (!serverid_register(procid_self(),
+                               FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) {
+                DEBUG(1, ("Could not register myself in serverid.tdb\n"));
+                exit(1);
+        }
 
         messaging_register(nmbd_messaging_context(), NULL,
@@ -1018 +1029 @@
         }
 
+        if (!nmbd_init_packet_server()) {
+                kill_async_dns_child();
+                exit(1);
+        }
+
         TALLOC_FREE(frame);
         process();
 
-        if (dbf)
-                x_fclose(dbf);
         kill_async_dns_child();
         return(0);