s3:winbindd: fix problems with SIGCHLD handling (bug #7317)

[samba.git] / source3 / winbindd / winbindd_dual.c

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 4d22ec868f59e0a9b3bc25829598ee0102316451..eb9ace23d678936dc3b93706454912bb3ef1172b 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -367,85 +367,6 @@ int wb_domain_request_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
        return 0;
 }
 
-/*
- * Machinery for async requests sent to children. You set up a
- * winbindd_request, select a child to query, and issue a async_request
- * call. When the request is completed, the callback function you specified is
- * called back with the private pointer you gave to async_request.
- */
-
-struct winbindd_async_request {
-       struct winbindd_async_request *next, *prev;
-       TALLOC_CTX *mem_ctx;
-       struct winbindd_child *child;
-       struct winbindd_response *response;
-       void (*continuation)(void *private_data, bool success);
-       struct timed_event *reply_timeout_event;
-       pid_t child_pid; /* pid of the child we're waiting on. Used to detect
-                           a restart of the child (child->pid != child_pid). */
-       void *private_data;
-};
-
-static void async_request_done(struct tevent_req *req);
-
-void async_request(TALLOC_CTX *mem_ctx, struct winbindd_child *child,
-                  struct winbindd_request *request,
-                  struct winbindd_response *response,
-                  void (*continuation)(void *private_data, bool success),
-                  void *private_data)
-{
-       struct winbindd_async_request *state;
-       struct tevent_req *req;
-
-       DEBUG(10, ("Sending request to child pid %d (domain=%s)\n",
-                  (int)child->pid,
-                  (child->domain != NULL) ? child->domain->name : "''"));
-
-       state = talloc(mem_ctx, struct winbindd_async_request);
-       if (state == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               continuation(private_data, False);
-               return;
-       }
-
-       state->mem_ctx = mem_ctx;
-       state->child = child;
-       state->reply_timeout_event = NULL;
-       state->response = response;
-       state->continuation = continuation;
-       state->private_data = private_data;
-
-       request->pid = child->pid;
-
-       req = wb_child_request_send(state, winbind_event_context(),
-                                          child, request);
-       if (req == NULL) {
-               DEBUG(0, ("wb_child_request_send failed\n"));
-                continuation(private_data, false);
-               return;
-        }
-       tevent_req_set_callback(req, async_request_done, state);
-}
-
-static void async_request_done(struct tevent_req *req)
-{
-       struct winbindd_async_request *state = tevent_req_callback_data(
-               req, struct winbindd_async_request);
-       struct winbindd_response *response;
-       int ret, err;
-
-       ret = wb_child_request_recv(req, state, &response, &err);
-       TALLOC_FREE(req);
-       if (ret == -1) {
-               DEBUG(2, ("wb_child_request_recv failed: %s\n",
-                         strerror(err)));
-               state->continuation(state->private_data, false);
-               return;
-       }
-       *state->response = *response;
-       state->continuation(state->private_data, true);
-}
-
 struct domain_request_state {
        struct winbindd_domain *domain;
        struct winbindd_request *request;
@@ -581,7 +502,7 @@ void setup_child(struct winbindd_domain *domain, struct winbindd_child *child,
                          "logname == NULL");
        }
 
-       child->domain = NULL;
+       child->domain = domain;
        child->table = table;
        child->queue = tevent_queue_create(NULL, "winbind_child");
        SMB_ASSERT(child->queue != NULL);
@@ -689,7 +610,7 @@ void winbind_msg_offline(struct messaging_context *msg_ctx,
        }
 
        for (child = children; child != NULL; child = child->next) {
-               /* Don't send message to internal childs.  We've already
+               /* Don't send message to internal children.  We've already
                   done so above. */
                if (!child->domain || winbindd_internal_child(child)) {
                        continue;
@@ -823,7 +744,7 @@ void winbind_msg_onlinestatus(struct messaging_context *msg_ctx,
        TALLOC_CTX *mem_ctx;
        const char *message;
        struct server_id *sender;
-       
+
        DEBUG(5,("winbind_msg_onlinestatus received.\n"));
 
        if (!data->data) {
@@ -836,7 +757,7 @@ void winbind_msg_onlinestatus(struct messaging_context *msg_ctx,
        if (mem_ctx == NULL) {
                return;
        }
-       
+
        message = collect_onlinestatus(mem_ctx);
        if (message == NULL) {
                talloc_destroy(mem_ctx);
@@ -1294,6 +1215,9 @@ bool winbindd_reinit_after_fork(const char *logfilename)
                                            logfilename))
                return false;
 
+       /* Stop zombies in children */
+       CatchChild();
+
        /* Don't handle the same messages as our parent. */
        messaging_deregister(winbind_messaging_context(),
                             MSG_SMB_CONF_UPDATED, NULL);
@@ -1384,7 +1308,6 @@ static bool fork_domain_child(struct winbindd_child *child)
        } else {
                DEBUG(10, ("fork_domain_child called without domain.\n"));
        }
-       child_domain = child->domain;
 
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) != 0) {
                DEBUG(0, ("Could not open child pipe: %s\n",
@@ -1414,12 +1337,10 @@ static bool fork_domain_child(struct winbindd_child *child)
        }
 
        /* Child */
+       child_domain = child->domain;
 
        DEBUG(10, ("Child process %d\n", (int)sys_getpid()));
 
-       /* Stop zombies in children */
-       CatchChild();
-
        state.sock = fdpair[0];
        close(fdpair[1]);
 
@@ -1542,6 +1463,14 @@ static bool fork_domain_child(struct winbindd_child *child)
                FD_SET(state.sock, &r_fds);
                maxfd = state.sock;
 
+               /*
+                * Initialize this high as event_add_to_select_args()
+                * uses a timeval_min() on this and next_event. Fix
+                * from Roel van Meer <rolek@alt001.com>.
+                */
+               t.tv_sec = 999999;
+               t.tv_usec = 0;
+
                event_add_to_select_args(winbind_event_context(), &now,
                                         &r_fds, &w_fds, &t, &maxfd);
                tp = get_timed_events_timeout(winbind_event_context(), &t);