s3: only include gen_ndr headers where needed.

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

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index ca6af1f37b5765fcf260f494651e84092f911ab0..c622b3ccc2521a90ee6761eb968cb391d9969570 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -30,6 +30,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -367,95 +368,6 @@ int wb_domain_request_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
        return 0;
 }
 
-struct domain_request_state {
-       struct winbindd_domain *domain;
-       struct winbindd_request *request;
-       struct winbindd_response *response;
-       void (*continuation)(void *private_data_data, bool success);
-       void *private_data_data;
-};
-
-static void async_domain_request_done(struct tevent_req *req);
-
-void async_domain_request(TALLOC_CTX *mem_ctx,
-                         struct winbindd_domain *domain,
-                         struct winbindd_request *request,
-                         struct winbindd_response *response,
-                         void (*continuation)(void *private_data_data, bool success),
-                         void *private_data_data)
-{
-       struct tevent_req *subreq;
-       struct domain_request_state *state;
-
-       state = TALLOC_P(mem_ctx, struct domain_request_state);
-       if (state == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               continuation(private_data_data, False);
-               return;
-       }
-
-       state->domain = domain;
-       state->request = request;
-       state->response = response;
-       state->continuation = continuation;
-       state->private_data_data = private_data_data;
-
-       subreq = wb_domain_request_send(state, winbind_event_context(),
-                                       domain, request);
-       if (subreq == NULL) {
-               DEBUG(5, ("wb_domain_request_send failed\n"));
-               continuation(private_data_data, false);
-               return;
-       }
-       tevent_req_set_callback(subreq, async_domain_request_done, state);
-}
-
-static void async_domain_request_done(struct tevent_req *req)
-{
-       struct domain_request_state *state = tevent_req_callback_data(
-               req, struct domain_request_state);
-       struct winbindd_response *response;
-       int ret, err;
-
-       ret = wb_domain_request_recv(req, state, &response, &err);
-       TALLOC_FREE(req);
-       if (ret == -1) {
-               DEBUG(5, ("wb_domain_request returned %s\n", strerror(err)));
-               state->continuation(state->private_data_data, false);
-               return;
-       }
-       *(state->response) = *response;
-       state->continuation(state->private_data_data, true);
-}
-
-static void recvfrom_child(void *private_data_data, bool success)
-{
-       struct winbindd_cli_state *state =
-               talloc_get_type_abort(private_data_data, struct winbindd_cli_state);
-       enum winbindd_result result = state->response->result;
-
-       /* This is an optimization: The child has written directly to the
-        * response buffer. The request itself is still in pending state,
-        * state that in the result code. */
-
-       state->response->result = WINBINDD_PENDING;
-
-       if ((!success) || (result != WINBINDD_OK)) {
-               request_error(state);
-               return;
-       }
-
-       request_ok(state);
-}
-
-void sendto_domain(struct winbindd_cli_state *state,
-                  struct winbindd_domain *domain)
-{
-       async_domain_request(state->mem_ctx, domain,
-                            state->request, state->response,
-                            recvfrom_child, state);
-}
-
 static void child_process_request(struct winbindd_child *child,
                                  struct winbindd_cli_state *state)
 {
@@ -1215,6 +1127,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);
@@ -1338,9 +1253,6 @@ static bool fork_domain_child(struct winbindd_child *child)
 
        DEBUG(10, ("Child process %d\n", (int)sys_getpid()));
 
-       /* Stop zombies in children */
-       CatchChild();
-
        state.sock = fdpair[0];
        close(fdpair[1]);