Changeset 745 for trunk/server/source4/smbd/process_standard.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)
• source4/smbd/process_standard.c (modified) (11 diffs)

trunk/server/source4/smbd/process_standard.c

@@ -24 +24 @@
 #include "includes.h"
 #include "lib/events/events.h"
-#include "../tdb/include/tdb.h"
 #include "smbd/process_model.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
+#include "ldb_wrap.h"
 
 #ifdef HAVE_SETPROCTITLE
@@ -51 +51 @@
   called when the process model is selected
 */
-static void standard_model_init(struct tevent_context *ev)
+static void standard_model_init(void)
 {
         pipe(child_pipe);
@@ -81 +81 @@
         struct socket_context *sock2;
         pid_t pid;
-        struct tevent_context *ev2;
         struct socket_address *c, *s;
 
@@ -107 +106 @@
 
         /* This is now the child code. We need a completely new event_context to work with */
-        ev2 = s4_event_context_init(NULL);
-
-        /* the service has given us a private pointer that
-           encapsulates the context it needs for this new connection -
-           everything else will be freed */
-        talloc_steal(ev2, private_data);
-        talloc_steal(private_data, sock2);
+
+        if (tevent_re_initialise(ev) != 0) {
+                smb_panic("Failed to re-initialise tevent after fork");
+        }
 
         /* this will free all the listening sockets and all state that
            is not associated with this new connection */
         talloc_free(sock);
-        talloc_free(ev);
 
         /* we don't care if the dup fails, as its only a select()
@@ -125 +120 @@
                         
         /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n"));
-        }
-
-        tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ,
+        ldb_wrap_fork_hook();
+
+        tevent_add_fd(ev, ev, child_pipe[0], TEVENT_FD_READ,
                       standard_pipe_handler, NULL);
         close(child_pipe[1]);
@@ -137 +130 @@
 
         /* setup the process title */
-        c = socket_get_peer_addr(sock2, ev2);
-        s = socket_get_my_addr(sock2, ev2);
+        c = socket_get_peer_addr(sock2, ev);
+        s = socket_get_my_addr(sock2, ev);
         if (s && c) {
                 setproctitle("conn c[%s:%u] s[%s:%u] server_id[%d]",
-                             c->addr, c->port, s->addr, s->port, pid);
+                             c->addr, c->port, s->addr, s->port, (int)pid);
         }
         talloc_free(c);
@@ -147 +140 @@
 
         /* setup this new connection.  Cluster ID is PID based for this process modal */
-        new_conn(ev2, lp_ctx, sock2, cluster_id(pid, 0), private_data);
+        new_conn(ev, lp_ctx, sock2, cluster_id(pid, 0), private_data);
 
         /* we can't return to the top level here, as that event context is gone,
            so we now process events in the new event context until there are no
            more to process */      
-        event_loop_wait(ev2);
-
-        talloc_free(ev2);
+        event_loop_wait(ev);
+
+        talloc_free(ev);
         exit(0);
 }
@@ -164 +157 @@
                               struct loadparm_context *lp_ctx,
                               const char *service_name,
-                              void (*new_task)(struct tevent_context *, struct loadparm_context *lp_ctx, struct server_id , void *), 
+                              void (*new_task)(struct tevent_context *, struct loadparm_context *lp_ctx, struct server_id , void *),
                               void *private_data)
 {
         pid_t pid;
-        struct tevent_context *ev2;
 
         pid = fork();
@@ -179 +171 @@
         pid = getpid();
 
-        /* This is now the child code. We need a completely new event_context to work with */
-        ev2 = s4_event_context_init(NULL);
-
-        /* the service has given us a private pointer that
-           encapsulates the context it needs for this new connection -
-           everything else will be freed */
-        talloc_steal(ev2, private_data);
-
         /* this will free all the listening sockets and all state that
            is not associated with this new connection */
-        talloc_free(ev);
-
-        /* tdb needs special fork handling */
-        if (tdb_reopen_all(1) == -1) {
-                DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n"));
-        }
-
-        tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ,
+        if (tevent_re_initialise(ev) != 0) {
+                smb_panic("Failed to re-initialise tevent after fork");
+        }
+
+        /* ldb/tdb need special fork handling */
+        ldb_wrap_fork_hook();
+
+        tevent_add_fd(ev, ev, child_pipe[0], TEVENT_FD_READ,
                       standard_pipe_handler, NULL);
         close(child_pipe[1]);
@@ -203 +187 @@
         set_need_random_reseed();
 
-        setproctitle("task %s server_id[%d]", service_name, pid);
+        setproctitle("task %s server_id[%d]", service_name, (int)pid);
 
         /* setup this new task.  Cluster ID is PID based for this process modal */
-        new_task(ev2, lp_ctx, cluster_id(pid, 0), private_data);
+        new_task(ev, lp_ctx, cluster_id(pid, 0), private_data);
 
         /* we can't return to the top level here, as that event context is gone,
            so we now process events in the new event context until there are no
            more to process */      
-        event_loop_wait(ev2);
-
-        talloc_free(ev2);
+        event_loop_wait(ev);
+
+        talloc_free(ev);
         exit(0);
 }
@@ -219 +203 @@
 
 /* called when a task goes down */
-_NORETURN_ static void standard_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx, 
+_NORETURN_ static void standard_terminate(struct tevent_context *ev, struct loadparm_context *lp_ctx,
                                           const char *reason) 
 {
         DEBUG(2,("standard_terminate: reason[%s]\n",reason));
+
+        talloc_free(ev);
 
         /* this reload_charcnv() has the effect of freeing the iconv context memory,
            which makes leak checking easier */
         reload_charcnv(lp_ctx);
-
-        talloc_free(ev);
 
         /* terminate this process */