s3: Add winbindd_lookupsids
[ira/wip.git] / source3 / winbindd / winbindd.c
index e4c22a610af58ecff0271231c1c1cef173a83c69..330f9008317d81e1cbfcd8efd2e301ceb922b07d 100644 (file)
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "winbindd.h"
-#include "../../nsswitch/libwbclient/wbc_async.h"
+#include "nsswitch/winbind_client.h"
+#include "nsswitch/wb_reqtrans.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
+#include "../librpc/gen_ndr/srv_samr.h"
+#include "secrets.h"
+#include "idmap.h"
+#include "lib/addrchange.h"
+#include "serverid.h"
+#include "auth.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+static bool client_is_idle(struct winbindd_cli_state *state);
 static void remove_client(struct winbindd_cli_state *state);
 
 static bool opt_nocache = False;
@@ -36,28 +47,14 @@ 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());
+       struct messaging_context *msg_ctx = server_messaging_context();
+       if (likely(msg_ctx != NULL)) {
+               return msg_ctx;
        }
-       if (ctx == NULL) {
-               DEBUG(0, ("Could not init winbind messaging context.\n"));
-       }
-       return ctx;
+       smb_panic("Could not init winbindd's messaging context.\n");
+       return NULL;
 }
 
 /* Reload configuration */
@@ -90,15 +87,6 @@ static bool reload_services_file(const char *lfile)
 }
 
 
-/**************************************************************************** **
- Handle a fault..
- **************************************************************************** */
-
-static void fault_quit(void)
-{
-       dump_core();
-}
-
 static void winbindd_status(void)
 {
        struct winbindd_cli_state *tmp;
@@ -112,19 +100,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)
@@ -199,6 +181,7 @@ static void terminate(bool is_parent)
 #endif
 
        if (is_parent) {
+               serverid_deregister(procid_self());
                pidfile_unlink();
        }
 
@@ -343,7 +326,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)
@@ -395,8 +378,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"));
@@ -406,7 +387,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) {
@@ -424,16 +404,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));
@@ -448,14 +424,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,
@@ -468,6 +436,7 @@ static struct winbindd_dispatch_table {
          "INTERFACE_VERSION" },
        { WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
        { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
+       { WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
        { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
        { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
          "WINBINDD_PRIV_PIPE_DIR" },
@@ -502,6 +471,8 @@ static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
          wb_ping_send, wb_ping_recv },
        { WINBINDD_LOOKUPSID, "LOOKUPSID",
          winbindd_lookupsid_send, winbindd_lookupsid_recv },
+       { WINBINDD_LOOKUPSIDS, "LOOKUPSIDS",
+         winbindd_lookupsids_send, winbindd_lookupsids_recv },
        { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
          winbindd_lookupname_send, winbindd_lookupname_recv },
        { WINBINDD_SID_TO_UID, "SID_TO_UID",
@@ -558,6 +529,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 }
 };
@@ -567,14 +547,10 @@ 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 }
 };
@@ -586,13 +562,16 @@ static void 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) {
@@ -613,8 +592,11 @@ 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, ("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);
@@ -625,7 +607,6 @@ static void process_request(struct winbindd_cli_state *state)
                        return;
                }
                tevent_req_set_callback(req, wb_request_done, state);
-               state->recv_fn = atable->recv_req;
                return;
        }
 
@@ -643,6 +624,7 @@ static void process_request(struct winbindd_cli_state *state)
                if (state->request->cmd == table->cmd) {
                        DEBUG(10,("process_request: request fn %s\n",
                                  table->winbindd_cmd_name ));
+                       state->cmd_name = table->winbindd_cmd_name;
                        table->fn(state);
                        break;
                }
@@ -661,8 +643,11 @@ 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) {
+               DEBUG(0, ("wb_request_done[%d:%s]: talloc_zero failed - removing client\n",
+                         (int)state->pid, state->cmd_name));
                remove_client(state);
                return;
        }
@@ -671,8 +656,11 @@ 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;
        }
@@ -704,6 +692,8 @@ static void request_finished(struct winbindd_cli_state *state)
                                 state->out_queue, state->sock,
                                 state->response);
        if (req == NULL) {
+               DEBUG(10,("request_finished[%d:%s]: wb_resp_write_send() failed\n",
+                         (int)state->pid, state->cmd_name));
                remove_client(state);
                return;
        }
@@ -722,14 +712,19 @@ static void winbind_client_response_written(struct tevent_req *req)
        if (ret == -1) {
                close(state->sock);
                state->sock = -1;
-               DEBUG(2, ("Could not write response to client: %s\n",
-                         strerror(err)));
+               DEBUG(2, ("Could not write response[%d:%s] to client: %s\n",
+                         (int)state->pid, state->cmd_name, strerror(err)));
                remove_client(state);
                return;
        }
 
+       DEBUG(10,("winbind_client_response_written[%d:%s]: delivered response "
+                 "to client\n", (int)state->pid, state->cmd_name));
+
        TALLOC_FREE(state->mem_ctx);
        state->response = NULL;
+       state->cmd_name = "no request";
+       state->recv_fn = NULL;
 
        req = wb_req_read_send(state, winbind_event_context(), state->sock,
                               WINBINDD_MAX_EXTRA_DATA);
@@ -768,13 +763,15 @@ static void new_connection(int listen_sock, bool privileged)
 
        len = sizeof(sunaddr);
 
-       do {
-               sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr,
-                             &len);
-       } while (sock == -1 && errno == EINTR);
+       sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr, &len);
 
-       if (sock == -1)
+       if (sock == -1) {
+               if (errno != EINTR) {
+                       DEBUG(0, ("Faild to accept socket - %s\n",
+                                 strerror(errno)));
+               }
                return;
+       }
 
        DEBUG(6,("accepted socket %d\n", sock));
 
@@ -872,6 +869,13 @@ static void remove_client(struct winbindd_cli_state *state)
        TALLOC_FREE(state);
 }
 
+/* Is a client idle? */
+
+static bool client_is_idle(struct winbindd_cli_state *state) {
+  return (state->response == NULL &&
+         !state->pwent_state && !state->grent_state);
+}
+
 /* Shutdown client connection which has been idle for the longest time */
 
 static bool remove_idle_client(void)
@@ -881,8 +885,7 @@ static bool remove_idle_client(void)
        int nidle = 0;
 
        for (state = winbindd_client_list(); state; state = state->next) {
-               if (state->response == NULL &&
-                   !state->pwent_state && !state->grent_state) {
+               if (client_is_idle(state)) {
                        nidle++;
                        if (!last_access || state->last_access < last_access) {
                                last_access = state->last_access;
@@ -914,23 +917,35 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev,
        struct winbindd_listen_state *s = talloc_get_type_abort(private_data,
                                          struct winbindd_listen_state);
 
-       while (winbindd_num_clients() >
-              WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+       while (winbindd_num_clients() > lp_winbind_max_clients() - 1) {
                DEBUG(5,("winbindd: Exceeding %d client "
                         "connections, removing idle "
-                        "connection.\n",
-                        WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                        "connection.\n", lp_winbind_max_clients()));
                if (!remove_idle_client()) {
                        DEBUG(0,("winbindd: Exceeding %d "
                                 "client connections, no idle "
                                 "connection found\n",
-                                WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                                lp_winbind_max_clients()));
                        break;
                }
        }
        new_connection(s->fd, s->privileged);
 }
 
+/*
+ * Winbindd socket accessor functions
+ */
+
+const char *get_winbind_pipe_dir(void)
+{
+       return lp_parm_const_string(-1, "winbindd", "socket dir", WINBINDD_SOCKET_DIR);
+}
+
+char *get_winbind_priv_pipe_dir(void)
+{
+       return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR);
+}
+
 static bool winbindd_setup_listeners(void)
 {
        struct winbindd_listen_state *pub_state = NULL;
@@ -944,7 +959,8 @@ static bool winbindd_setup_listeners(void)
        }
 
        pub_state->privileged = false;
-       pub_state->fd = open_winbindd_socket();
+       pub_state->fd = create_pipe_sock(
+               get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
        if (pub_state->fd == -1) {
                goto failed;
        }
@@ -965,7 +981,8 @@ static bool winbindd_setup_listeners(void)
        }
 
        priv_state->privileged = true;
-       priv_state->fd = open_winbindd_priv_socket();
+       priv_state->fd = create_pipe_sock(
+               get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750);
        if (priv_state->fd == -1) {
                goto failed;
        }
@@ -996,6 +1013,183 @@ bool winbindd_use_cache(void)
        return !opt_nocache;
 }
 
+void winbindd_register_handlers(void)
+{
+       /* Setup signal 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);
+
+       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()) {
+               exit(1);
+       }
+
+       /* get broadcast messages */
+
+       if (!serverid_register(procid_self(),
+                              FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) {
+               DEBUG(1, ("Could not register myself in serverid.tdb\n"));
+               exit(1);
+       }
+
+       /* 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);
+
+       messaging_register(winbind_messaging_context(), NULL,
+                          MSG_WINBIND_IP_DROPPED,
+                          winbind_msg_ip_dropped_parent);
+
+       /* 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();
+
+       if (lp_allow_trusted_domains()) {
+               if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+                             rescan_trusted_domains, NULL) == NULL) {
+                       DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+                       exit(1);
+               }
+       }
+
+}
+
+struct winbindd_addrchanged_state {
+       struct addrchange_context *ctx;
+       struct tevent_context *ev;
+       struct messaging_context *msg_ctx;
+};
+
+static void winbindd_addr_changed(struct tevent_req *req);
+
+static void winbindd_init_addrchange(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    struct messaging_context *msg_ctx)
+{
+       struct winbindd_addrchanged_state *state;
+       struct tevent_req *req;
+       NTSTATUS status;
+
+       state = talloc(mem_ctx, struct winbindd_addrchanged_state);
+       if (state == NULL) {
+               DEBUG(10, ("talloc failed\n"));
+               return;
+       }
+       state->ev = ev;
+       state->msg_ctx = msg_ctx;
+
+       status = addrchange_context_create(state, &state->ctx);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("addrchange_context_create failed: %s\n",
+                          nt_errstr(status)));
+               TALLOC_FREE(state);
+               return;
+       }
+       req = addrchange_send(state, ev, state->ctx);
+       if (req == NULL) {
+               DEBUG(0, ("addrchange_send failed\n"));
+               TALLOC_FREE(state);
+               return;
+       }
+       tevent_req_set_callback(req, winbindd_addr_changed, state);
+}
+
+static void winbindd_addr_changed(struct tevent_req *req)
+{
+       struct winbindd_addrchanged_state *state = tevent_req_callback_data(
+               req, struct winbindd_addrchanged_state);
+       enum addrchange_type type;
+       struct sockaddr_storage addr;
+       NTSTATUS status;
+
+       status = addrchange_recv(req, &type, &addr);
+       TALLOC_FREE(req);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("addrchange_recv failed: %s, stop listening\n",
+                          nt_errstr(status)));
+               TALLOC_FREE(state);
+               return;
+       }
+       if (type == ADDRCHANGE_DEL) {
+               char addrstr[INET6_ADDRSTRLEN];
+               DATA_BLOB blob;
+
+               print_sockaddr(addrstr, sizeof(addrstr), &addr);
+
+               DEBUG(3, ("winbindd: kernel (AF_NETLINK) dropped ip %s\n",
+                         addrstr));
+
+               blob = data_blob_const(addrstr, strlen(addrstr)+1);
+
+               status = messaging_send(state->msg_ctx,
+                                       messaging_server_id(state->msg_ctx),
+                                       MSG_WINBIND_IP_DROPPED, &blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(10, ("messaging_send failed: %s - ignoring\n",
+                                  nt_errstr(status)));
+               }
+       }
+       req = addrchange_send(state, state->ev, state->ctx);
+       if (req == NULL) {
+               DEBUG(0, ("addrchange_send failed\n"));
+               TALLOC_FREE(state);
+               return;
+       }
+       tevent_req_set_callback(req, winbindd_addr_changed, state);
+}
+
 /* Main function */
 
 int main(int argc, char **argv, char **envp)
@@ -1023,8 +1217,14 @@ int main(int argc, char **argv, char **envp)
        };
        poptContext pc;
        int opt;
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct tevent_timer *te;
+       TALLOC_CTX *frame;
+       NTSTATUS status;
+
+       /*
+        * Do this before any other talloc operation
+        */
+       talloc_enable_null_tracking();
+       frame = talloc_stackframe();
 
        /* glibc (?) likes to print "User defined signal 1" and exit if a
           SIGUSR[12] is received before a handler is installed */
@@ -1032,8 +1232,8 @@ int main(int argc, char **argv, char **envp)
        CatchSignal(SIGUSR1, SIG_IGN);
        CatchSignal(SIGUSR2, SIG_IGN);
 
-       fault_setup((void (*)(void *))fault_quit );
-       dump_core_setup("winbindd");
+       fault_setup();
+       dump_core_setup("winbindd", lp_logfile());
 
        load_case_tables();
 
@@ -1110,14 +1310,18 @@ int main(int argc, char **argv, char **envp)
                        SAFE_FREE(lfile);
                }
        }
-       setup_logging("winbindd", log_stdout);
+       if (log_stdout) {
+               setup_logging("winbindd", DEBUG_STDOUT);
+       } else {
+               setup_logging("winbindd", DEBUG_FILE);
+       }
        reopen_logs();
 
        DEBUG(0,("winbindd version %s started.\n", samba_version_string()));
        DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
-               DEBUG(0, ("error opening config file\n"));
+               DEBUG(0, ("error opening config file '%s'\n", get_dyn_CONFIGFILE()));
                exit(1);
        }
 
@@ -1149,10 +1353,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. */
 
@@ -1165,7 +1365,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");
 
@@ -1185,84 +1385,28 @@ 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);
-
-       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()) {
-               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"));
+       status = init_system_info();
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("ERROR: failed to setup system user info: %s.\n",
+                         nt_errstr(status)));
                exit(1);
        }
 
-       init_idmap_child();
-       init_locator_child();
+       rpc_lsarpc_init(NULL);
+       rpc_samr_init(NULL);
 
-       smb_nscd_flush_user_cache();
-       smb_nscd_flush_group_cache();
+       winbindd_init_addrchange(NULL, winbind_event_context(),
+                                winbind_messaging_context());
 
        /* setup listen sockets */
 
@@ -1271,13 +1415,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) {