s4-smbd: minimise includes in smbd/ and smb_server

[kai/samba-autobuild/.git] / source4 / smbd / process_standard.c

diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index b20adbfd1605e3ae2e50e2aee788d480ac774cac..49aaf8481a811361447e554834223b44dcfdf2f7 100644 (file)
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -24,9 +24,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "../tdb/include/tdb.h"
-#include "lib/socket/socket.h"
 #include "smbd/process_model.h"
-#include "param/secrets.h"
 #include "system/filesys.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
@@ -44,14 +42,30 @@ static int none_setproctitle(const char *fmt, ...)
 }
 #endif
 
+/* we hold a pipe open in the parent, and the any child
+   processes wait for EOF on that pipe. This ensures that
+   children die when the parent dies */
+static int child_pipe[2];
+
 /*
   called when the process model is selected
 */
 static void standard_model_init(struct tevent_context *ev)
 {
+       pipe(child_pipe);
        signal(SIGCHLD, SIG_IGN);
 }
 
+/*
+  handle EOF on the child pipe
+*/
+static void standard_pipe_handler(struct tevent_context *event_ctx, struct tevent_fd *fde, 
+                                 uint16_t flags, void *private_data)
+{
+       DEBUG(10,("Child %d exiting\n", (int)getpid()));
+       exit(0);
+}
+
 /*
   called when a listening socket becomes readable. 
 */
@@ -61,7 +75,7 @@ static void standard_accept_connection(struct tevent_context *ev,
                                       void (*new_conn)(struct tevent_context *,
                                                        struct loadparm_context *, struct socket_context *, 
                                                        struct server_id , void *), 
-                                      void *private)
+                                      void *private_data)
 {
        NTSTATUS status;
        struct socket_context *sock2;
@@ -97,8 +111,8 @@ static void standard_accept_connection(struct tevent_context *ev,
        /* 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);
-       talloc_steal(private, sock2);
+       talloc_steal(ev2, private_data);
+       talloc_steal(private_data, sock2);
 
        /* this will free all the listening sockets and all state that
           is not associated with this new connection */
@@ -114,6 +128,10 @@ static void standard_accept_connection(struct tevent_context *ev,
                DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n"));
        }
 
+       tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ,
+                     standard_pipe_handler, NULL);
+       close(child_pipe[1]);
+
        /* Ensure that the forked children do not expose identical random streams */
        set_need_random_reseed();
 
@@ -128,7 +146,7 @@ static void standard_accept_connection(struct tevent_context *ev,
        talloc_free(s);
 
        /* setup this new connection.  Cluster ID is PID based for this process modal */
-       new_conn(ev2, lp_ctx, sock2, cluster_id(pid, 0), private);
+       new_conn(ev2, 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
@@ -146,7 +164,7 @@ static void standard_new_task(struct tevent_context *ev,
                              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 *private)
+                             void *private_data)
 {
        pid_t pid;
        struct tevent_context *ev2;
@@ -166,7 +184,7 @@ static void standard_new_task(struct tevent_context *ev,
        /* 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);
+       talloc_steal(ev2, private_data);
 
        /* this will free all the listening sockets and all state that
           is not associated with this new connection */
@@ -177,13 +195,17 @@ static void standard_new_task(struct tevent_context *ev,
                DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n"));
        }
 
+       tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ,
+                     standard_pipe_handler, NULL);
+       close(child_pipe[1]);
+
        /* Ensure that the forked children do not expose identical random streams */
        set_need_random_reseed();
 
        setproctitle("task %s server_id[%d]", service_name, pid);
 
        /* setup this new task.  Cluster ID is PID based for this process modal */
-       new_task(ev2, lp_ctx, cluster_id(pid, 0), private);
+       new_task(ev2, 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