Changeset 165 for branches/samba-3.0/source/smbd/server.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/smbd/server.c (modified) (4 diffs)

branches/samba-3.0/source/smbd/server.c

@@ -300 +300 @@
  Open the socket communication.
 ****************************************************************************/
+
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                        struct event_context *ev_ctx,
+                        bool parent_longlived);
 
 static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports)
@@ -561 +565 @@
                                                         False);
                                 
-                                /* Reset the state of the random
-                                 * number generation system, so
-                                 * children do not get the same random
-                                 * numbers as each other */
-
-                                set_need_random_reseed();
-                                /* tdb needs special fork handling - remove
-                                 * CLEAR_IF_FIRST flags */
-                                if (tdb_reopen_all(1) == -1) {
-                                        DEBUG(0,("tdb_reopen_all failed.\n"));
-                                        smb_panic("tdb_reopen_all failed.");
+                                if (!reinit_after_fork(smbd_messaging_context(),
+                                                       smbd_event_context(),
+                                                       true)) {
+                                        DEBUG(0, ("reinit_after_fork failed.\n"));
+                                        smb_panic("reinit_after_fork failed.\n");
                                 }
 
                                 return True; 
                         }
+                        /* The parent doesn't need this socket */
+                        close(smbd_server_fd()); 
 
                         /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
@@ -946 +946 @@
 
         reopen_logs();
+
 #ifdef __OS2__
         unsigned long  _System DosSetPriority (unsigned long  ulScope, unsigned long  ulClass, long lDelta, unsigned long ulID);
@@ -956 +957 @@
         DEBUG(0,( "Server priority set to PRTYC_FOREGROUNDSERVER\n"));
 #endif
+
         DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
         DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );