s3: Use talloc_tos() in yield_connection()

[ira/wip.git] / source3 / winbindd / winbindd.c

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index e09374c5cb1842baf5e2f5200e2c1fba9047f90c..e4df27b45e6f4bd4a7f7098c00acb324a4ee7579 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -51,7 +51,7 @@ struct messaging_context *winbind_messaging_context(void)
        static struct messaging_context *ctx;
 
        if (ctx == NULL) {
-               ctx = messaging_init(NULL, server_id_self(),
+               ctx = messaging_init(NULL, procid_self(),
                                     winbind_event_context());
        }
        if (ctx == NULL) {
@@ -141,6 +141,29 @@ static void flush_caches(void)
        }
 }
 
+static void flush_caches_noinit(void)
+{
+       /*
+        * We need to invalidate cached user list entries on a SIGHUP
+         * otherwise cached access denied errors due to restrict anonymous
+         * hang around until the sequence number changes.
+        * NB
+        * Skip uninitialized domains when flush cache.
+        * If domain is not initialized, it means it is never
+        * used or never become online. look, wcache_invalidate_cache()
+        * -> get_cache() -> init_dc_connection(). It causes a lot of traffic
+        * for unused domains and large traffic for primay domain's DC if there
+        * are many domains..
+        */
+
+       if (!wcache_invalidate_cache_noinit()) {
+               DEBUG(0, ("invalidating the cache failed; revalidate the cache\n"));
+               if (!winbindd_cache_validate_and_initialize()) {
+                       exit(1);
+               }
+       }
+}
+
 /* Handle the signal by unlinking socket and exiting */
 
 static void terminate(bool is_parent)
@@ -254,7 +277,7 @@ static void winbindd_sig_hup_handler(struct tevent_context *ev,
        const char *file = (const char *)private_data;
 
        DEBUG(1,("Reloading services after SIGHUP\n"));
-       flush_caches();
+       flush_caches_noinit();
        reload_services_file(file);
 }
 
@@ -451,6 +474,7 @@ static struct winbindd_dispatch_table {
 
        /* Credential cache access */
        { WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
+       { WINBINDD_CCACHE_SAVE, winbindd_ccache_save, "CCACHE_SAVE" },
 
        /* WINS functions */
 
@@ -532,6 +556,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_list_groups_send, winbindd_list_groups_recv },
        { WINBINDD_CHECK_MACHACC, "CHECK_MACHACC",
          winbindd_check_machine_acct_send, winbindd_check_machine_acct_recv },
+       { WINBINDD_PING_DC, "PING_DC",
+         winbindd_ping_dc_send, winbindd_ping_dc_recv },
 
        { 0, NULL, NULL, NULL }
 };
@@ -796,10 +822,15 @@ static void winbind_client_request_read(struct tevent_req *req)
        ret = wb_req_read_recv(req, state, &state->request, &err);
        TALLOC_FREE(req);
        if (ret == -1) {
+               if (err == EPIPE) {
+                       DEBUG(6, ("closing socket %d, client exited\n",
+                                 state->sock));
+               } else {
+                       DEBUG(2, ("Could not read client request from fd %d: "
+                                 "%s\n", state->sock, strerror(err)));
+               }
                close(state->sock);
                state->sock = -1;
-               DEBUG(2, ("Could not read client request: %s\n",
-                         strerror(err)));
                remove_client(state);
                return;
        }
@@ -833,10 +864,6 @@ static void remove_client(struct winbindd_cli_state *state)
                state->sock = -1;
        }
 
-       /* Free any getent state */
-
-       free_getent_state(state->getgrent_state);
-
        TALLOC_FREE(state->mem_ctx);
 
        /* Remove from list and free */
@@ -855,7 +882,7 @@ static bool remove_idle_client(void)
 
        for (state = winbindd_client_list(); state; state = state->next) {
                if (state->response == NULL &&
-                   !state->pwent_state && !state->getgrent_state) {
+                   !state->pwent_state && !state->grent_state) {
                        nidle++;
                        if (!last_access || state->last_access < last_access) {
                                last_access = state->last_access;