Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by...
[ira/wip.git] / source3 / winbindd / winbindd_dual.c
index 1985dd8b12b83eff01731f953122d74cb09d92fa..26f92322a1e9588f0c3abb3ffca0c6cd21df368b 100644 (file)
@@ -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;
@@ -527,13 +448,6 @@ static void recvfrom_child(void *private_data_data, bool success)
        request_ok(state);
 }
 
-void sendto_child(struct winbindd_cli_state *state,
-                 struct winbindd_child *child)
-{
-       async_request(state->mem_ctx, child, state->request,
-                     state->response, recvfrom_child, state);
-}
-
 void sendto_domain(struct winbindd_cli_state *state,
                   struct winbindd_domain *domain)
 {
@@ -573,7 +487,7 @@ static void child_process_request(struct winbindd_child *child,
        state->response->result = WINBINDD_ERROR;
 }
 
-void setup_child(struct winbindd_child *child,
+void setup_child(struct winbindd_domain *domain, struct winbindd_child *child,
                 const struct winbindd_child_dispatch_table *table,
                 const char *logprefix,
                 const char *logname)
@@ -588,10 +502,12 @@ void setup_child(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);
+       child->rpccli = wbint_rpccli_create(NULL, domain, child);
+       SMB_ASSERT(child->rpccli != NULL);
 }
 
 struct winbindd_child *children = NULL;
@@ -694,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;
@@ -828,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) {
@@ -841,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);
@@ -1017,6 +933,7 @@ static bool calculate_next_machine_pwd_change(const char *domain,
        time_t pass_last_set_time;
        time_t timeout;
        time_t next_change;
+       struct timeval tv;
        char *pw;
 
        pw = secrets_fetch_machine_password(domain,
@@ -1036,11 +953,36 @@ static bool calculate_next_machine_pwd_change(const char *domain,
                return false;
        }
 
+       tv.tv_sec = pass_last_set_time;
+       DEBUG(10, ("password last changed %s\n",
+                  timeval_string(talloc_tos(), &tv, false)));
+       tv.tv_sec += timeout;
+       DEBUGADD(10, ("password valid until %s\n",
+                     timeval_string(talloc_tos(), &tv, false)));
+
        if (time(NULL) < (pass_last_set_time + timeout)) {
                next_change = pass_last_set_time + timeout;
                DEBUG(10,("machine password still valid until: %s\n",
                        http_timestring(talloc_tos(), next_change)));
                *t = timeval_set(next_change, 0);
+
+               if (lp_clustering()) {
+                       uint8_t randbuf;
+                       /*
+                        * When having a cluster, we have several
+                        * winbinds racing for the password change. In
+                        * the machine_password_change_handler()
+                        * function we check if someone else was
+                        * faster when the event triggers. We add a
+                        * 255-second random delay here, so that we
+                        * don't run to change the password at the
+                        * exact same moment.
+                        */
+                       generate_random_buffer(&randbuf, sizeof(randbuf));
+                       DEBUG(10, ("adding %d seconds randomness\n",
+                                  (int)randbuf));
+                       t->tv_sec += randbuf;
+               }
                return true;
        }
 
@@ -1069,9 +1011,18 @@ static void machine_password_change_handler(struct event_context *ctx,
 
        if (!calculate_next_machine_pwd_change(child->domain->name,
                                               &next_change)) {
+               DEBUG(10, ("calculate_next_machine_pwd_change failed\n"));
                return;
        }
 
+       DEBUG(10, ("calculate_next_machine_pwd_change returned %s\n",
+                  timeval_string(talloc_tos(), &next_change, false)));
+
+       if (!timeval_expired(&next_change)) {
+               DEBUG(10, ("Someone else has already changed the pw\n"));
+               goto done;
+       }
+
        if (!winbindd_can_contact_domain(child->domain)) {
                DEBUG(10,("machine_password_change_handler: Removing myself since I "
                          "do not have an incoming trust to domain %s\n",
@@ -1094,15 +1045,38 @@ static void machine_password_change_handler(struct event_context *ctx,
                                                   child->domain->name);
        TALLOC_FREE(frame);
 
+       DEBUG(10, ("machine_password_change_handler: "
+                  "trust_pw_find_change_and_store_it returned %s\n",
+                  nt_errstr(result)));
+
+       if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) ) {
+               DEBUG(3,("machine_password_change_handler: password set returned "
+                        "ACCESS_DENIED.  Maybe the trust account "
+                        "password was changed and we didn't know it. "
+                        "Killing connections to domain %s\n",
+                        child->domain->name));
+               TALLOC_FREE(child->domain->conn.netlogon_pipe);
+       }
+
+       if (!calculate_next_machine_pwd_change(child->domain->name,
+                                              &next_change)) {
+               DEBUG(10, ("calculate_next_machine_pwd_change failed\n"));
+               return;
+       }
+
+       DEBUG(10, ("calculate_next_machine_pwd_change returned %s\n",
+                  timeval_string(talloc_tos(), &next_change, false)));
+
        if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(10,("machine_password_change_handler: "
-                       "failed to change machine password: %s\n",
-                        nt_errstr(result)));
-       } else {
-               DEBUG(10,("machine_password_change_handler: "
-                       "successfully changed machine password\n"));
+               struct timeval tmp;
+               /*
+                * In case of failure, give the DC a minute to recover
+                */
+               tmp = timeval_current_ofs(60, 0);
+               next_change = timeval_max(&next_change, &tmp);
        }
 
+done:
        child->machine_password_change_event = event_add_timed(winbind_event_context(), NULL,
                                                              next_change,
                                                              machine_password_change_handler,
@@ -1307,6 +1281,16 @@ bool winbindd_reinit_after_fork(const char *logfilename)
        return true;
 }
 
+/*
+ * In a child there will be only one domain, reference that here.
+ */
+static struct winbindd_domain *child_domain;
+
+struct winbindd_domain *wb_child_domain(void)
+{
+       return child_domain;
+}
+
 static bool fork_domain_child(struct winbindd_child *child)
 {
        int fdpair[2];
@@ -1321,6 +1305,7 @@ 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",
@@ -1478,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);