s3compat-only s3:winbindd Move more parts of winbindd.c into winbindd_event.c
[abartlet/samba.git/.git] / source3 / winbindd / winbindd.c
index f6f4a8fee78c9f641a404f96922258bd1dd71403..97ca4d1cbb85c4a76dd547ab30dfdd6be1c5d0e9 100644 (file)
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "winbindd.h"
+#include "nsswitch/winbind_client.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
+#include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
+#include "../librpc/gen_ndr/srv_samr.h"
+#include "secrets.h"
+#include "idmap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static void remove_client(struct winbindd_cli_state *state);
-
 static bool opt_nocache = False;
 static bool interactive = False;
 
 extern bool override_logfile;
 
-struct event_context *winbind_event_context(void)
-{
-       static struct event_context *ctx;
-
-       if (!ctx && !(ctx = event_context_init(NULL))) {
-               smb_panic("Could not init winbind event context");
-       }
-       return ctx;
-}
-
-struct messaging_context *winbind_messaging_context(void)
-{
-       static struct messaging_context *ctx;
-
-       if (ctx == NULL) {
-               ctx = messaging_init(NULL, server_id_self(),
-                                    winbind_event_context());
-       }
-       if (ctx == NULL) {
-               DEBUG(0, ("Could not init winbind messaging context.\n"));
-       }
-       return ctx;
-}
-
 /* Reload configuration */
 
 static bool reload_services_file(const char *lfile)
@@ -112,19 +93,13 @@ static void winbindd_status(void)
        if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
                DEBUG(2, ("\tclient list:\n"));
                for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
-                       DEBUGADD(2, ("\t\tpid %lu, sock %d\n",
-                                 (unsigned long)tmp->pid, tmp->sock));
+                       DEBUGADD(2, ("\t\tpid %lu, sock %d (%s)\n",
+                                    (unsigned long)tmp->pid, tmp->sock,
+                                    client_is_idle(tmp) ? "idle" : "active"));
                }
        }
 }
 
-/* Print winbindd status to log file */
-
-static void print_winbindd_status(void)
-{
-       winbindd_status();
-}
-
 /* Flush client cache */
 
 static void flush_caches(void)
@@ -141,6 +116,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)
@@ -176,6 +174,7 @@ static void terminate(bool is_parent)
 #endif
 
        if (is_parent) {
+               serverid_deregister(procid_self());
                pidfile_unlink();
        }
 
@@ -254,7 +253,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);
 }
 
@@ -320,7 +319,7 @@ static void winbindd_sig_usr2_handler(struct tevent_context *ev,
                                      void *siginfo,
                                      void *private_data)
 {
-       print_winbindd_status();
+       winbindd_status();
 }
 
 static bool winbindd_setup_sig_usr2_handler(void)
@@ -372,8 +371,6 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
 {
        uint8 ret;
        pid_t child_pid;
-       struct sigaction act;
-       struct sigaction oldact;
 
        DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache "
                   "message.\n"));
@@ -383,7 +380,6 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
         * so we don't block the main winbindd and the validation
         * code can safely use fork/waitpid...
         */
-       CatchChild();
        child_pid = sys_fork();
 
        if (child_pid == -1) {
@@ -401,16 +397,12 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
 
        /* child */
 
+       if (!winbindd_reinit_after_fork(NULL)) {
+               _exit(0);
+       }
+
        /* install default SIGCHLD handler: validation code uses fork/waitpid */
-       ZERO_STRUCT(act);
-       act.sa_handler = SIG_DFL;
-#ifdef SA_RESTART
-       /* We *want* SIGALRM to interrupt a system call. */
-       act.sa_flags = SA_RESTART;
-#endif
-       sigemptyset(&act.sa_mask);
-       sigaddset(&act.sa_mask,SIGCHLD);
-       sigaction(SIGCHLD,&act,&oldact);
+       CatchSignal(SIGCHLD, SIG_DFL);
 
        ret = (uint8)winbindd_validate_cache_nobackup();
        DEBUG(10, ("winbindd_msg_validata_cache: got return value %d\n", ret));
@@ -425,14 +417,6 @@ static struct winbindd_dispatch_table {
        const char *winbindd_cmd_name;
 } dispatch_table[] = {
 
-       /* PAM auth functions */
-
-       { WINBINDD_PAM_AUTH, winbindd_pam_auth, "PAM_AUTH" },
-       { WINBINDD_PAM_AUTH_CRAP, winbindd_pam_auth_crap, "AUTH_CRAP" },
-       { WINBINDD_PAM_CHAUTHTOK, winbindd_pam_chauthtok, "CHAUTHTOK" },
-       { WINBINDD_PAM_LOGOFF, winbindd_pam_logoff, "PAM_LOGOFF" },
-       { WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP, winbindd_pam_chng_pswd_auth_crap, "CHNG_PSWD_AUTH_CRAP" },
-
        /* Enumeration functions */
 
        { WINBINDD_LIST_TRUSTDOM, winbindd_list_trusted_domains,
@@ -451,6 +435,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 */
 
@@ -534,6 +519,15 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          winbindd_check_machine_acct_send, winbindd_check_machine_acct_recv },
        { WINBINDD_PING_DC, "PING_DC",
          winbindd_ping_dc_send, winbindd_ping_dc_recv },
+       { WINBINDD_PAM_AUTH, "PAM_AUTH",
+         winbindd_pam_auth_send, winbindd_pam_auth_recv },
+       { WINBINDD_PAM_LOGOFF, "PAM_LOGOFF",
+         winbindd_pam_logoff_send, winbindd_pam_logoff_recv },
+       { WINBINDD_PAM_CHAUTHTOK, "PAM_CHAUTHTOK",
+         winbindd_pam_chauthtok_send, winbindd_pam_chauthtok_recv },
+       { WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP, "PAM_CHNG_PSWD_AUTH_CRAP",
+         winbindd_pam_chng_pswd_auth_crap_send,
+         winbindd_pam_chng_pswd_auth_crap_recv },
 
        { 0, NULL, NULL, NULL }
 };
@@ -543,32 +537,31 @@ static struct winbindd_async_dispatch_table async_priv_table[] = {
          winbindd_allocate_uid_send, winbindd_allocate_uid_recv },
        { WINBINDD_ALLOCATE_GID, "ALLOCATE_GID",
          winbindd_allocate_gid_send, winbindd_allocate_gid_recv },
-       { WINBINDD_SET_MAPPING, "SET_MAPPING",
-         winbindd_set_mapping_send, winbindd_set_mapping_recv },
-       { WINBINDD_REMOVE_MAPPING, "SET_MAPPING",
-         winbindd_remove_mapping_send, winbindd_remove_mapping_recv },
-       { WINBINDD_SET_HWM, "SET_HWM",
-         winbindd_set_hwm_send, winbindd_set_hwm_recv },
        { WINBINDD_CHANGE_MACHACC, "CHANGE_MACHACC",
          winbindd_change_machine_acct_send, winbindd_change_machine_acct_recv },
+       { WINBINDD_PAM_AUTH_CRAP, "PAM_AUTH_CRAP",
+         winbindd_pam_auth_crap_send, winbindd_pam_auth_crap_recv },
 
        { 0, NULL, NULL, NULL }
 };
 
 static void wb_request_done(struct tevent_req *req);
 
-static void process_request(struct winbindd_cli_state *state)
+void wb_process_request(struct winbindd_cli_state *state)
 {
        struct winbindd_dispatch_table *table = dispatch_table;
        struct winbindd_async_dispatch_table *atable;
 
-       state->mem_ctx = talloc_init("winbind request");
+       state->mem_ctx = talloc_named(state, 0, "winbind request");
        if (state->mem_ctx == NULL)
                return;
 
        /* Remember who asked us. */
        state->pid = state->request->pid;
 
+       state->cmd_name = "unknown request";
+       state->recv_fn = NULL;
+
        /* Process command */
 
        for (atable = async_nonpriv_table; atable->send_req; atable += 1) {
@@ -589,19 +582,21 @@ static void process_request(struct winbindd_cli_state *state)
        if (atable->send_req != NULL) {
                struct tevent_req *req;
 
-               DEBUG(10, ("process_request: Handling async request %s\n",
-                          atable->cmd_name));
+               state->cmd_name = atable->cmd_name;
+               state->recv_fn = atable->recv_req;
+
+               DEBUG(10, ("wb_process_request: Handling async request %d:%s\n",
+                          (int)state->pid, state->cmd_name));
 
                req = atable->send_req(state->mem_ctx, winbind_event_context(),
                                       state, state->request);
                if (req == NULL) {
-                       DEBUG(0, ("process_request: atable->send failed for "
+                       DEBUG(0, ("wb_process_request: atable->send failed for "
                                  "%s\n", atable->cmd_name));
                        request_error(state);
                        return;
                }
                tevent_req_set_callback(req, wb_request_done, state);
-               state->recv_fn = atable->recv_req;
                return;
        }
 
@@ -609,7 +604,7 @@ static void process_request(struct winbindd_cli_state *state)
                                      struct winbindd_response);
        if (state->response == NULL) {
                DEBUG(10, ("talloc failed\n"));
-               remove_client(state);
+               winbindd_remove_client(state);
                return;
        }
        state->response->result = WINBINDD_PENDING;
@@ -617,15 +612,16 @@ static void process_request(struct winbindd_cli_state *state)
 
        for (table = dispatch_table; table->fn; table++) {
                if (state->request->cmd == table->cmd) {
-                       DEBUG(10,("process_request: request fn %s\n",
+                       DEBUG(10,("wb_process_request: request fn %s\n",
                                  table->winbindd_cmd_name ));
+                       state->cmd_name = table->winbindd_cmd_name;
                        table->fn(state);
                        break;
                }
        }
 
        if (!table->fn) {
-               DEBUG(10,("process_request: unknown request fn number %d\n",
+               DEBUG(10,("wb_process_request: unknown request fn number %d\n",
                          (int)state->request->cmd ));
                request_error(state);
        }
@@ -637,9 +633,12 @@ static void wb_request_done(struct tevent_req *req)
                req, struct winbindd_cli_state);
        NTSTATUS status;
 
-       state->response = talloc_zero(state, struct winbindd_response);
+       state->response = talloc_zero(state->mem_ctx,
+                                     struct winbindd_response);
        if (state->response == NULL) {
-               remove_client(state);
+               DEBUG(0, ("wb_request_done[%d:%s]: talloc_zero failed - removing client\n",
+                         (int)state->pid, state->cmd_name));
+               winbindd_remove_client(state);
                return;
        }
        state->response->result = WINBINDD_PENDING;
@@ -647,75 +646,17 @@ static void wb_request_done(struct tevent_req *req)
 
        status = state->recv_fn(req, state->response);
        TALLOC_FREE(req);
+
+       DEBUG(10,("wb_request_done[%d:%s]: %s\n",
+                 (int)state->pid, state->cmd_name, nt_errstr(status)));
+
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("returning %s\n", nt_errstr(status)));
                request_error(state);
                return;
        }
        request_ok(state);
 }
 
-/*
- * This is the main event loop of winbind requests. It goes through a
- * state-machine of 3 read/write requests, 4 if you have extra data to send.
- *
- * An idle winbind client has a read request of 4 bytes outstanding,
- * finalizing function is request_len_recv, checking the length. request_recv
- * then processes the packet. The processing function then at some point has
- * to call request_finished which schedules sending the response.
- */
-
-static void request_finished(struct winbindd_cli_state *state);
-
-static void winbind_client_request_read(struct tevent_req *req);
-static void winbind_client_response_written(struct tevent_req *req);
-
-static void request_finished(struct winbindd_cli_state *state)
-{
-       struct tevent_req *req;
-
-       TALLOC_FREE(state->request);
-
-       req = wb_resp_write_send(state, winbind_event_context(),
-                                state->out_queue, state->sock,
-                                state->response);
-       if (req == NULL) {
-               remove_client(state);
-               return;
-       }
-       tevent_req_set_callback(req, winbind_client_response_written, state);
-}
-
-static void winbind_client_response_written(struct tevent_req *req)
-{
-       struct winbindd_cli_state *state = tevent_req_callback_data(
-               req, struct winbindd_cli_state);
-       ssize_t ret;
-       int err;
-
-       ret = wb_resp_write_recv(req, &err);
-       TALLOC_FREE(req);
-       if (ret == -1) {
-               close(state->sock);
-               state->sock = -1;
-               DEBUG(2, ("Could not write response to client: %s\n",
-                         strerror(err)));
-               remove_client(state);
-               return;
-       }
-
-       TALLOC_FREE(state->mem_ctx);
-       state->response = NULL;
-
-       req = wb_req_read_send(state, winbind_event_context(), state->sock,
-                              WINBINDD_MAX_EXTRA_DATA);
-       if (req == NULL) {
-               remove_client(state);
-               return;
-       }
-       tevent_req_set_callback(req, winbind_client_request_read, state);
-}
-
 void request_error(struct winbindd_cli_state *state)
 {
        SMB_ASSERT(state->response->result == WINBINDD_PENDING);
@@ -730,246 +671,103 @@ void request_ok(struct winbindd_cli_state *state)
        request_finished(state);
 }
 
-/* Process a new connection by adding it to the client connection list */
-
-static void new_connection(int listen_sock, bool privileged)
+bool winbindd_use_idmap_cache(void)
 {
-       struct sockaddr_un sunaddr;
-       struct winbindd_cli_state *state;
-       struct tevent_req *req;
-       socklen_t len;
-       int sock;
-
-       /* Accept connection */
-
-       len = sizeof(sunaddr);
-
-       do {
-               sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr,
-                             &len);
-       } while (sock == -1 && errno == EINTR);
-
-       if (sock == -1)
-               return;
-
-       DEBUG(6,("accepted socket %d\n", sock));
-
-       /* Create new connection structure */
-
-       if ((state = TALLOC_ZERO_P(NULL, struct winbindd_cli_state)) == NULL) {
-               close(sock);
-               return;
-       }
-
-       state->sock = sock;
-
-       state->out_queue = tevent_queue_create(state, "winbind client reply");
-       if (state->out_queue == NULL) {
-               close(sock);
-               TALLOC_FREE(state);
-               return;
-       }
-
-       state->last_access = time(NULL);        
-
-       state->privileged = privileged;
-
-       req = wb_req_read_send(state, winbind_event_context(), state->sock,
-                              WINBINDD_MAX_EXTRA_DATA);
-       if (req == NULL) {
-               TALLOC_FREE(state);
-               close(sock);
-               return;
-       }
-       tevent_req_set_callback(req, winbind_client_request_read, state);
-
-       /* Add to connection list */
-
-       winbindd_add_client(state);
+       return !opt_nocache;
 }
 
-static void winbind_client_request_read(struct tevent_req *req)
+bool winbindd_use_cache(void)
 {
-       struct winbindd_cli_state *state = tevent_req_callback_data(
-               req, struct winbindd_cli_state);
-       ssize_t ret;
-       int err;
-
-       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;
-               remove_client(state);
-               return;
-       }
-       process_request(state);
+       return !opt_nocache;
 }
 
-/* Remove a client connection from client connection list */
-
-static void remove_client(struct winbindd_cli_state *state)
+void winbindd_register_handlers(void)
 {
-       char c = 0;
-       int nwritten;
-
-       /* It's a dead client - hold a funeral */
-
-       if (state == NULL) {
-               return;
-       }
+       struct tevent_timer *te;
+       /* Setup signal handlers */
 
-       if (state->sock != -1) {
-               /* tell client, we are closing ... */
-               nwritten = write(state->sock, &c, sizeof(c));
-               if (nwritten == -1) {
-                       DEBUG(2, ("final write to client failed: %s\n",
-                               strerror(errno)));
-               }
+       if (!winbindd_setup_sig_term_handler(true))
+               exit(1);
+       if (!winbindd_setup_sig_hup_handler(NULL))
+               exit(1);
+       if (!winbindd_setup_sig_chld_handler())
+               exit(1);
+       if (!winbindd_setup_sig_usr2_handler())
+               exit(1);
 
-               /* Close socket */
+       CatchSignal(SIGPIPE, SIG_IGN);                 /* Ignore sigpipe */
 
-               close(state->sock);
-               state->sock = -1;
+       /*
+        * Ensure all cache and idmap caches are consistent
+        * and initialized before we startup.
+        */
+       if (!winbindd_cache_validate_and_initialize()) {
+               exit(1);
        }
 
-       TALLOC_FREE(state->mem_ctx);
+       /* get broadcast messages */
 
-       /* Remove from list and free */
+       if (!serverid_register(procid_self(),
+                              FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) {
+               DEBUG(1, ("Could not register myself in serverid.tdb\n"));
+               exit(1);
+       }
 
-       winbindd_remove_client(state);
-       TALLOC_FREE(state);
-}
+       /* React on 'smbcontrol winbindd reload-config' in the same way
+          as to SIGHUP signal */
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_SMB_CONF_UPDATED, msg_reload_services);
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_SHUTDOWN, msg_shutdown);
 
-/* Shutdown client connection which has been idle for the longest time */
+       /* Handle online/offline messages. */
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_OFFLINE, winbind_msg_offline);
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_ONLINE, winbind_msg_online);
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
 
-static bool remove_idle_client(void)
-{
-       struct winbindd_cli_state *state, *remove_state = NULL;
-       time_t last_access = 0;
-       int nidle = 0;
-
-       for (state = winbindd_client_list(); state; state = state->next) {
-               if (state->response == NULL &&
-                   !state->pwent_state && !state->grent_state) {
-                       nidle++;
-                       if (!last_access || state->last_access < last_access) {
-                               last_access = state->last_access;
-                               remove_state = state;
-                       }
-               }
-       }
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
 
-       if (remove_state) {
-               DEBUG(5,("Found %d idle client connections, shutting down sock %d, pid %u\n",
-                       nidle, remove_state->sock, (unsigned int)remove_state->pid));
-               remove_client(remove_state);
-               return True;
-       }
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_VALIDATE_CACHE,
+                          winbind_msg_validate_cache);
 
-       return False;
-}
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_DUMP_DOMAIN_LIST,
+                          winbind_msg_dump_domain_list);
 
-struct winbindd_listen_state {
-       bool privileged;
-       int fd;
-};
+       /* Register handler for MSG_DEBUG. */
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_DEBUG,
+                          winbind_msg_debug);
 
-static void winbindd_listen_fde_handler(struct tevent_context *ev,
-                                       struct tevent_fd *fde,
-                                       uint16_t flags,
-                                       void *private_data)
-{
-       struct winbindd_listen_state *s = talloc_get_type_abort(private_data,
-                                         struct winbindd_listen_state);
-
-       while (winbindd_num_clients() >
-              WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
-               DEBUG(5,("winbindd: Exceeding %d client "
-                        "connections, removing idle "
-                        "connection.\n",
-                        WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-               if (!remove_idle_client()) {
-                       DEBUG(0,("winbindd: Exceeding %d "
-                                "client connections, no idle "
-                                "connection found\n",
-                                WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-                       break;
-               }
-       }
-       new_connection(s->fd, s->privileged);
-}
+       netsamlogon_cache_init(); /* Non-critical */
 
-static bool winbindd_setup_listeners(void)
-{
-       struct winbindd_listen_state *pub_state = NULL;
-       struct winbindd_listen_state *priv_state = NULL;
-       struct tevent_fd *fde;
-
-       pub_state = talloc(winbind_event_context(),
-                          struct winbindd_listen_state);
-       if (!pub_state) {
-               goto failed;
-       }
+       /* clear the cached list of trusted domains */
 
-       pub_state->privileged = false;
-       pub_state->fd = open_winbindd_socket();
-       if (pub_state->fd == -1) {
-               goto failed;
-       }
+       wcache_tdc_clear();
 
-       fde = tevent_add_fd(winbind_event_context(), pub_state, pub_state->fd,
-                           TEVENT_FD_READ, winbindd_listen_fde_handler,
-                           pub_state);
-       if (fde == NULL) {
-               close(pub_state->fd);
-               goto failed;
+       if (!init_domain_list()) {
+               DEBUG(0,("unable to initialize domain list\n"));
+               exit(1);
        }
-       tevent_fd_set_auto_close(fde);
 
-       priv_state = talloc(winbind_event_context(),
-                           struct winbindd_listen_state);
-       if (!priv_state) {
-               goto failed;
-       }
+       init_idmap_child();
+       init_locator_child();
 
-       priv_state->privileged = true;
-       priv_state->fd = open_winbindd_priv_socket();
-       if (priv_state->fd == -1) {
-               goto failed;
-       }
+       smb_nscd_flush_user_cache();
+       smb_nscd_flush_group_cache();
 
-       fde = tevent_add_fd(winbind_event_context(), priv_state,
-                           priv_state->fd, TEVENT_FD_READ,
-                           winbindd_listen_fde_handler, priv_state);
-       if (fde == NULL) {
-               close(priv_state->fd);
-               goto failed;
+       te = tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+                             rescan_trusted_domains, NULL);
+       if (te == NULL) {
+               DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+               exit(1);
        }
-       tevent_fd_set_auto_close(fde);
-
-       return true;
-failed:
-       TALLOC_FREE(pub_state);
-       TALLOC_FREE(priv_state);
-       return false;
-}
-
-bool winbindd_use_idmap_cache(void)
-{
-       return !opt_nocache;
-}
 
-bool winbindd_use_cache(void)
-{
-       return !opt_nocache;
 }
 
 /* Main function */
@@ -1000,7 +798,7 @@ int main(int argc, char **argv, char **envp)
        poptContext pc;
        int opt;
        TALLOC_CTX *frame = talloc_stackframe();
-       struct tevent_timer *te;
+       NTSTATUS status;
 
        /* glibc (?) likes to print "User defined signal 1" and exit if a
           SIGUSR[12] is received before a handler is installed */
@@ -1125,10 +923,6 @@ int main(int argc, char **argv, char **envp)
                return False;
        }
 
-       /* Enable netbios namecache */
-
-       namecache_enable();
-
        /* Unblock all signals we are interested in as they may have been
           blocked by the parent process. */
 
@@ -1141,7 +935,7 @@ int main(int argc, char **argv, char **envp)
        BlockSignals(False, SIGCHLD);
 
        if (!interactive)
-               become_daemon(Fork, no_process_group);
+               become_daemon(Fork, no_process_group, log_stdout);
 
        pidfile_create("winbindd");
 
@@ -1161,85 +955,24 @@ int main(int argc, char **argv, char **envp)
         * winbindd-specific resources we must free yet. JRA.
         */
 
-       if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(),
-                                              winbind_event_context(),
-                                              false))) {
+       status = reinit_after_fork(winbind_messaging_context(),
+                                  winbind_event_context(),
+                                  procid_self(), false);
+       if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("reinit_after_fork() failed\n"));
                exit(1);
        }
 
-       /* Setup signal handlers */
+       winbindd_register_handlers();
 
-       if (!winbindd_setup_sig_term_handler(true))
-               exit(1);
-       if (!winbindd_setup_sig_hup_handler(NULL))
-               exit(1);
-       if (!winbindd_setup_sig_chld_handler())
-               exit(1);
-       if (!winbindd_setup_sig_usr2_handler())
-               exit(1);
+       rpc_lsarpc_init(NULL);
+       rpc_samr_init(NULL);
 
-       CatchSignal(SIGPIPE, SIG_IGN);                 /* Ignore sigpipe */
-
-       /*
-        * Ensure all cache and idmap caches are consistent
-        * and initialized before we startup.
-        */
-       if (!winbindd_cache_validate_and_initialize()) {
+       if (!init_system_info()) {
+               DEBUG(0,("ERROR: failed to setup system user info.\n"));
                exit(1);
        }
 
-       /* get broadcast messages */
-       claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP);
-
-       /* React on 'smbcontrol winbindd reload-config' in the same way
-          as to SIGHUP signal */
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_SMB_CONF_UPDATED, msg_reload_services);
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_SHUTDOWN, msg_shutdown);
-
-       /* Handle online/offline messages. */
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_WINBIND_OFFLINE, winbind_msg_offline);
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_WINBIND_ONLINE, winbind_msg_online);
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
-
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
-
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_WINBIND_VALIDATE_CACHE,
-                          winbind_msg_validate_cache);
-
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_WINBIND_DUMP_DOMAIN_LIST,
-                          winbind_msg_dump_domain_list);
-
-       /* Register handler for MSG_DEBUG. */
-       messaging_register(winbind_messaging_context(), NULL,
-                          MSG_DEBUG,
-                          winbind_msg_debug);
-
-       netsamlogon_cache_init(); /* Non-critical */
-
-       /* clear the cached list of trusted domains */
-
-       wcache_tdc_clear();     
-
-       if (!init_domain_list()) {
-               DEBUG(0,("unable to initialize domain list\n"));
-               exit(1);
-       }
-
-       init_idmap_child();
-       init_locator_child();
-
-       smb_nscd_flush_user_cache();
-       smb_nscd_flush_group_cache();
-
        /* setup listen sockets */
 
        if (!winbindd_setup_listeners()) {
@@ -1247,13 +980,6 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
 
-       te = tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
-                             rescan_trusted_domains, NULL);
-       if (te == NULL) {
-               DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
-               exit(1);
-       }
-
        TALLOC_FREE(frame);
        /* Loop waiting for requests */
        while (1) {