s3:winbindd: move non event related code out of process_loop() in the the caller
[ira/wip.git] / source3 / winbindd / winbindd.c
index 8ebae3f16d2984fc6e954db30b80b5ee381cb031..d090b6f994afd5c2dbba20d9c73cce370ef3f604 100644 (file)
@@ -7,17 +7,17 @@
    Copyright (C) Andrew Tridgell 2002
    Copyright (C) Jelmer Vernooij 2003
    Copyright (C) Volker Lendecke 2004
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -28,7 +28,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-bool opt_nocache = False;
+static bool opt_nocache = False;
 static bool interactive = False;
 
 extern bool override_logfile;
@@ -47,27 +47,36 @@ struct messaging_context *winbind_messaging_context(void)
 {
        static struct messaging_context *ctx;
 
-       if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
-                                          winbind_event_context()))) {
-               smb_panic("Could not init winbind messaging context");
+       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(void)
+static bool reload_services_file(const char *lfile)
 {
        bool ret;
 
        if (lp_loaded()) {
                const char *fname = lp_configfile();
 
-               if (file_exist(fname,NULL) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
+               if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) {
                        set_dyn_CONFIGFILE(fname);
                }
        }
 
+       /* if this is a child, restore the logfile to the special
+          name - <domain>, idmap, etc. */
+       if (lfile && *lfile) {
+               lp_set_logfile(lfile);
+       }
+
        reopen_logs();
        ret = lp_load(get_dyn_CONFIGFILE(),False,False,True,True);
 
@@ -94,9 +103,9 @@ static void winbindd_status(void)
        DEBUG(0, ("winbindd status:\n"));
 
        /* Print client state information */
-       
+
        DEBUG(0, ("\t%d clients currently active\n", winbindd_num_clients()));
-       
+
        if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
                DEBUG(2, ("\tclient list:\n"));
                for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
@@ -123,18 +132,7 @@ static void flush_caches(void)
 
        if (!wcache_invalidate_cache()) {
                DEBUG(0, ("invalidating the cache failed; revalidate the cache\n"));
-               /* Close the cache to be able to valdite the cache */
-               close_winbindd_cache();
-               /*
-                * Ensure all cache and idmap caches are consistent
-                * before we initialize the cache again.
-                */
-               if (winbindd_validate_cache() < 0) {
-                       DEBUG(0, ("corrupted tdb found, trying to restore backup\n"));
-               }
-
-               /* Initialize cache again. */
-               if (!initialize_winbindd_cache()) {
+               if (!winbindd_cache_validate_and_initialize()) {
                        exit(1);
                }
        }
@@ -142,19 +140,24 @@ static void flush_caches(void)
 
 /* Handle the signal by unlinking socket and exiting */
 
-static void terminate(void)
+static void terminate(bool is_parent)
 {
-       char *path = NULL;
-
-       /* Remove socket file */
-       if (asprintf(&path, "%s/%s",
+       if (is_parent) {
+               /* When parent goes away we should
+                * remove the socket file. Not so
+                * when children terminate.
+                */ 
+               char *path = NULL;
+
+               if (asprintf(&path, "%s/%s",
                        get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME) > 0) {
-               unlink(path);
-               SAFE_FREE(path);
+                       unlink(path);
+                       SAFE_FREE(path);
+               }
        }
 
        idmap_close();
-       
+
        trustdom_cache_shutdown();
 
 #if 0
@@ -170,36 +173,161 @@ static void terminate(void)
        exit(0);
 }
 
-static bool do_sigterm;
+static void winbindd_sig_term_handler(struct tevent_context *ev,
+                                     struct tevent_signal *se,
+                                     int signum,
+                                     int count,
+                                     void *siginfo,
+                                     void *private_data)
+{
+       bool *is_parent = talloc_get_type_abort(private_data, bool);
+
+       DEBUG(0,("Got sig[%d] terminate (is_parent=%d)\n",
+                signum, (int)*is_parent));
+       terminate(*is_parent);
+}
 
-static void termination_handler(int signum)
+bool winbindd_setup_sig_term_handler(bool parent)
 {
-       do_sigterm = True;
-       sys_select_signal(signum);
+       struct tevent_signal *se;
+       bool *is_parent;
+
+       is_parent = talloc(winbind_event_context(), bool);
+       if (!is_parent) {
+               return false;
+       }
+
+       *is_parent = parent;
+
+       se = tevent_add_signal(winbind_event_context(),
+                              is_parent,
+                              SIGTERM, 0,
+                              winbindd_sig_term_handler,
+                              is_parent);
+       if (!se) {
+               DEBUG(0,("failed to setup SIGTERM handler"));
+               talloc_free(is_parent);
+               return false;
+       }
+
+       se = tevent_add_signal(winbind_event_context(),
+                              is_parent,
+                              SIGINT, 0,
+                              winbindd_sig_term_handler,
+                              is_parent);
+       if (!se) {
+               DEBUG(0,("failed to setup SIGINT handler"));
+               talloc_free(is_parent);
+               return false;
+       }
+
+       se = tevent_add_signal(winbind_event_context(),
+                              is_parent,
+                              SIGQUIT, 0,
+                              winbindd_sig_term_handler,
+                              is_parent);
+       if (!se) {
+               DEBUG(0,("failed to setup SIGINT handler"));
+               talloc_free(is_parent);
+               return false;
+       }
+
+       return true;
 }
 
-static bool do_sigusr2;
+static void winbindd_sig_hup_handler(struct tevent_context *ev,
+                                    struct tevent_signal *se,
+                                    int signum,
+                                    int count,
+                                    void *siginfo,
+                                    void *private_data)
+{
+       const char *file = (const char *)private_data;
+
+       DEBUG(1,("Reloading services after SIGHUP\n"));
+       flush_caches();
+       reload_services_file(file);
+}
 
-static void sigusr2_handler(int signum)
+bool winbindd_setup_sig_hup_handler(const char *lfile)
 {
-       do_sigusr2 = True;
-       sys_select_signal(SIGUSR2);
+       struct tevent_signal *se;
+       char *file = NULL;
+
+       if (lfile) {
+               file = talloc_strdup(winbind_event_context(),
+                                    lfile);
+               if (!file) {
+                       return false;
+               }
+       }
+
+       se = tevent_add_signal(winbind_event_context(),
+                              winbind_event_context(),
+                              SIGHUP, 0,
+                              winbindd_sig_hup_handler,
+                              file);
+       if (!se) {
+               return false;
+       }
+
+       return true;
 }
 
-static bool do_sighup;
+static void winbindd_sig_chld_handler(struct tevent_context *ev,
+                                     struct tevent_signal *se,
+                                     int signum,
+                                     int count,
+                                     void *siginfo,
+                                     void *private_data)
+{
+       pid_t pid;
+
+       while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
+               winbind_child_died(pid);
+       }
+}
 
-static void sighup_handler(int signum)
+static bool winbindd_setup_sig_chld_handler(void)
 {
-       do_sighup = True;
-       sys_select_signal(SIGHUP);
+       struct tevent_signal *se;
+
+       se = tevent_add_signal(winbind_event_context(),
+                              winbind_event_context(),
+                              SIGCHLD, 0,
+                              winbindd_sig_chld_handler,
+                              NULL);
+       if (!se) {
+               return false;
+       }
+
+       return true;
 }
 
-static bool do_sigchld;
+static void winbindd_sig_usr2_handler(struct tevent_context *ev,
+                                     struct tevent_signal *se,
+                                     int signum,
+                                     int count,
+                                     void *siginfo,
+                                     void *private_data)
+{
+       print_winbindd_status();
+}
 
-static void sigchld_handler(int signum)
+static bool winbindd_setup_sig_usr2_handler(void)
 {
-       do_sigchld = True;
-       sys_select_signal(SIGCHLD);
+       struct tevent_signal *se;
+
+       se = tevent_add_signal(winbind_event_context(),
+                              winbind_event_context(),
+                              SIGUSR2, 0,
+                              winbindd_sig_usr2_handler,
+                              NULL);
+       if (!se) {
+               return false;
+       }
+
+       return true;
 }
 
 /* React on 'smbcontrol winbindd reload-config' in the same way as on SIGHUP*/
@@ -211,7 +339,7 @@ static void msg_reload_services(struct messaging_context *msg,
 {
         /* Flush various caches */
        flush_caches();
-       reload_services_file();
+       reload_services_file((const char *) private_data);
 }
 
 /* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
@@ -221,7 +349,9 @@ static void msg_shutdown(struct messaging_context *msg,
                         struct server_id server_id,
                         DATA_BLOB *data)
 {
-       do_sigterm = True;
+       /* only the parent waits for this message */
+       DEBUG(0,("Got shutdown message\n"));
+       terminate(true);
 }
 
 
@@ -256,7 +386,7 @@ static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
        if (child_pid != 0) {
                /* parent */
                DEBUG(5, ("winbind_msg_validate_cache: child created with "
-                         "pid %d.\n", child_pid));
+                         "pid %d.\n", (int)child_pid));
                return;
        }
 
@@ -285,11 +415,12 @@ static struct winbindd_dispatch_table {
        void (*fn)(struct winbindd_cli_state *state);
        const char *winbindd_cmd_name;
 } dispatch_table[] = {
-       
+
        /* User functions */
 
        { WINBINDD_GETPWNAM, winbindd_getpwnam, "GETPWNAM" },
        { WINBINDD_GETPWUID, winbindd_getpwuid, "GETPWUID" },
+       { WINBINDD_GETPWSID, winbindd_getpwsid, "GETPWSID" },
 
        { WINBINDD_SETPWENT, winbindd_setpwent, "SETPWENT" },
        { WINBINDD_ENDPWENT, winbindd_endpwent, "ENDPWENT" },
@@ -299,6 +430,8 @@ static struct winbindd_dispatch_table {
        { WINBINDD_GETUSERSIDS, winbindd_getusersids, "GETUSERSIDS" },
        { WINBINDD_GETUSERDOMGROUPS, winbindd_getuserdomgroups,
          "GETUSERDOMGROUPS" },
+       { WINBINDD_GETSIDALIASES, winbindd_getsidaliases,
+          "LOOKUPUSERALIASES" },
 
        /* Group functions */
 
@@ -337,12 +470,10 @@ static struct winbindd_dispatch_table {
        { WINBINDD_SID_TO_GID, winbindd_sid_to_gid, "SID_TO_GID" },
        { WINBINDD_UID_TO_SID, winbindd_uid_to_sid, "UID_TO_SID" },
        { WINBINDD_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
-#if 0   /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
-       { WINBINDD_SIDS_TO_XIDS, winbindd_sids_to_unixids, "SIDS_TO_XIDS" },
-#endif  /* end DISABLED */
        { WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
        { WINBINDD_ALLOCATE_GID, winbindd_allocate_gid, "ALLOCATE_GID" },
        { WINBINDD_SET_MAPPING, winbindd_set_mapping, "SET_MAPPING" },
+       { WINBINDD_REMOVE_MAPPING, winbindd_remove_mapping, "REMOVE_MAPPING" },
        { WINBINDD_SET_HWM, winbindd_set_hwm, "SET_HWMS" },
 
        /* Miscellaneous */
@@ -367,7 +498,7 @@ static struct winbindd_dispatch_table {
 
        { WINBINDD_WINS_BYNAME, winbindd_wins_byname, "WINS_BYNAME" },
        { WINBINDD_WINS_BYIP, winbindd_wins_byip, "WINS_BYIP" },
-       
+
        /* End of list */
 
        { WINBINDD_NUM_CMDS, NULL, "NONE" }
@@ -414,16 +545,16 @@ static void process_request(struct winbindd_cli_state *state)
 
 /*
  * A list of file descriptors being monitored by select in the main processing
- * loop. fd_event->handler is called whenever the socket is readable/writable.
+ * loop. winbindd_fd_event->handler is called whenever the socket is readable/writable.
  */
 
-static struct fd_event *fd_events = NULL;
+static struct winbindd_fd_event *fd_events = NULL;
 
-void add_fd_event(struct fd_event *ev)
+void add_fd_event(struct winbindd_fd_event *ev)
 {
-       struct fd_event *match;
+       struct winbindd_fd_event *match;
 
-       /* only add unique fd_event structs */
+       /* only add unique winbindd_fd_event structs */
 
        for (match=fd_events; match; match=match->next ) {
 #ifdef DEVELOPER
@@ -437,17 +568,17 @@ void add_fd_event(struct fd_event *ev)
        DLIST_ADD(fd_events, ev);
 }
 
-void remove_fd_event(struct fd_event *ev)
+void remove_fd_event(struct winbindd_fd_event *ev)
 {
        DLIST_REMOVE(fd_events, ev);
 }
 
 /*
- * Handler for fd_events to complete a read/write request, set up by
+ * Handler for winbindd_fd_events to complete a read/write request, set up by
  * setup_async_read/setup_async_write.
  */
 
-static void rw_callback(struct fd_event *event, int flags)
+static void rw_callback(struct winbindd_fd_event *event, int flags)
 {
        size_t todo;
        ssize_t done = 0;
@@ -488,11 +619,11 @@ static void rw_callback(struct fd_event *event, int flags)
 }
 
 /*
- * Request an async read/write on a fd_event structure. (*finished) is called
+ * Request an async read/write on a winbindd_fd_event structure. (*finished) is called
  * when the request is completed or an error had occurred.
  */
 
-void setup_async_read(struct fd_event *event, void *data, size_t length,
+void setup_async_read(struct winbindd_fd_event *event, void *data, size_t length,
                      void (*finished)(void *private_data, bool success),
                      void *private_data)
 {
@@ -506,7 +637,7 @@ void setup_async_read(struct fd_event *event, void *data, size_t length,
        event->flags = EVENT_FD_READ;
 }
 
-void setup_async_write(struct fd_event *event, void *data, size_t length,
+void setup_async_write(struct winbindd_fd_event *event, void *data, size_t length,
                       void (*finished)(void *private_data, bool success),
                       void *private_data)
 {
@@ -534,7 +665,6 @@ static void request_len_recv(void *private_data, bool success);
 static void request_recv(void *private_data, bool success);
 static void request_main_recv(void *private_data, bool success);
 static void request_finished(struct winbindd_cli_state *state);
-void request_finished_cont(void *private_data, bool success);
 static void response_main_sent(void *private_data, bool success);
 static void response_extra_sent(void *private_data, bool success);
 
@@ -543,17 +673,13 @@ static void response_extra_sent(void *private_data, bool success)
        struct winbindd_cli_state *state =
                talloc_get_type_abort(private_data, struct winbindd_cli_state);
 
-       if (state->mem_ctx != NULL) {
-               talloc_destroy(state->mem_ctx);
-               state->mem_ctx = NULL;
-       }
+       TALLOC_FREE(state->mem_ctx);
 
        if (!success) {
                state->finished = True;
                return;
        }
 
-       SAFE_FREE(state->request.extra_data.data);
        SAFE_FREE(state->response.extra_data.data);
 
        setup_async_read(&state->fd_event, &state->request, sizeof(uint32),
@@ -571,10 +697,7 @@ static void response_main_sent(void *private_data, bool success)
        }
 
        if (state->response.length == sizeof(state->response)) {
-               if (state->mem_ctx != NULL) {
-                       talloc_destroy(state->mem_ctx);
-                       state->mem_ctx = NULL;
-               }
+               TALLOC_FREE(state->mem_ctx);
 
                setup_async_read(&state->fd_event, &state->request,
                                 sizeof(uint32), request_len_recv, state);
@@ -588,6 +711,8 @@ static void response_main_sent(void *private_data, bool success)
 
 static void request_finished(struct winbindd_cli_state *state)
 {
+       /* Make sure request.extra_data is freed when finish processing a request */
+       SAFE_FREE(state->request.extra_data.data);
        setup_async_write(&state->fd_event, &state->response,
                          sizeof(state->response), response_main_sent, state);
 }
@@ -606,17 +731,6 @@ void request_ok(struct winbindd_cli_state *state)
        request_finished(state);
 }
 
-void request_finished_cont(void *private_data, bool success)
-{
-       struct winbindd_cli_state *state =
-               talloc_get_type_abort(private_data, struct winbindd_cli_state);
-
-       if (success)
-               request_ok(state);
-       else
-               request_error(state);
-}
-
 static void request_len_recv(void *private_data, bool success)
 {
        struct winbindd_cli_state *state =
@@ -701,9 +815,9 @@ static void new_connection(int listen_sock, bool privileged)
        struct winbindd_cli_state *state;
        socklen_t len;
        int sock;
-       
+
        /* Accept connection */
-       
+
        len = sizeof(sunaddr);
 
        do {
@@ -712,16 +826,16 @@ static void new_connection(int listen_sock, bool privileged)
 
        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->last_access = time(NULL);        
@@ -736,7 +850,7 @@ static void new_connection(int listen_sock, bool privileged)
                         request_len_recv, state);
 
        /* Add to connection list */
-       
+
        winbindd_add_client(state);
 }
 
@@ -744,35 +858,42 @@ static void new_connection(int listen_sock, bool privileged)
 
 static void remove_client(struct winbindd_cli_state *state)
 {
+       char c = 0;
+       int nwritten;
+
        /* It's a dead client - hold a funeral */
-       
+
        if (state == NULL) {
                return;
        }
-               
+
+       /* 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)));
+       }
+
        /* Close socket */
-               
+
        close(state->sock);
-               
+
        /* Free any getent state */
-               
+
        free_getent_state(state->getpwent_state);
        free_getent_state(state->getgrent_state);
-               
+
        /* We may have some extra data that was not freed if the client was
           killed unexpectedly */
 
        SAFE_FREE(state->response.extra_data.data);
 
-       if (state->mem_ctx != NULL) {
-               talloc_destroy(state->mem_ctx);
-               state->mem_ctx = NULL;
-       }
+       TALLOC_FREE(state->mem_ctx);
 
        remove_fd_event(&state->fd_event);
-               
+
        /* Remove from list and free */
-               
+
        winbindd_remove_client(state);
        TALLOC_FREE(state);
 }
@@ -813,8 +934,7 @@ static bool remove_idle_client(void)
 
 static void process_loop(void)
 {
-       struct winbindd_cli_state *state;
-       struct fd_event *ev;
+       struct winbindd_fd_event *ev;
        fd_set r_fds, w_fds;
        int maxfd, listen_sock, listen_priv_sock, selret;
        struct timeval timeout, ev_timeout;
@@ -828,18 +948,8 @@ static void process_loop(void)
                exit(1);
        }
 
-       /* We'll be doing this a lot */
-
-       /* Handle messages */
-
-       message_dispatch(winbind_messaging_context());
-
        run_events(winbind_event_context(), 0, NULL, NULL);
 
-       /* refresh the trusted domain cache */
-
-       rescan_trusted_domains();
-
        /* Initialise fd lists for select() */
 
        maxfd = MAX(listen_sock, listen_priv_sock);
@@ -853,27 +963,17 @@ static void process_loop(void)
        timeout.tv_usec = 0;
 
        /* Check for any event timeouts. */
+       {
+               struct timeval now;
+               GetTimeOfDay(&now);
+
+               event_add_to_select_args(winbind_event_context(), &now,
+                                        &r_fds, &w_fds, &ev_timeout, &maxfd);
+       }
        if (get_timed_events_timeout(winbind_event_context(), &ev_timeout)) {
                timeout = timeval_min(&timeout, &ev_timeout);
        }
 
-       /* Set up client readers and writers */
-
-       state = winbindd_client_list();
-
-       while (state) {
-
-               struct winbindd_cli_state *next = state->next;
-
-               /* Dispose of client connection if it is marked as 
-                  finished */ 
-
-               if (state->finished)
-                       remove_client(state);
-
-               state = next;
-       }
-
        for (ev = fd_events; ev; ev = ev->next) {
                if (ev->flags & EVENT_FD_READ) {
                        FD_SET(ev->fd, &r_fds);
@@ -886,7 +986,7 @@ static void process_loop(void)
        }
 
        /* Call select */
-        
+
        selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
 
        if (selret == 0) {
@@ -906,9 +1006,11 @@ static void process_loop(void)
 
        /* selret > 0 */
 
+       run_events(winbind_event_context(), selret, &r_fds, &w_fds);
+
        ev = fd_events;
        while (ev != NULL) {
-               struct fd_event *next = ev->next;
+               struct winbindd_fd_event *next = ev->next;
                int flags = 0;
                if (FD_ISSET(ev->fd, &r_fds))
                        flags |= EVENT_FD_READ;
@@ -937,7 +1039,7 @@ static void process_loop(void)
                /* new, non-privileged connection */
                new_connection(listen_sock, False);
        }
-            
+
        if (FD_ISSET(listen_priv_sock, &r_fds)) {
                while (winbindd_num_clients() >
                       WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
@@ -959,39 +1061,21 @@ static void process_loop(void)
 
  no_fds_ready:
 
+       run_events(winbind_event_context(), selret, &r_fds, &w_fds);
+
 #if 0
        winbindd_check_cache_size(time(NULL));
 #endif
+}
 
-       /* Check signal handling things */
-
-       if (do_sigterm)
-               terminate();
-
-       if (do_sighup) {
-
-               DEBUG(3, ("got SIGHUP\n"));
-
-               flush_caches();
-               reload_services_file();
-
-               do_sighup = False;
-       }
-
-       if (do_sigusr2) {
-               print_winbindd_status();
-               do_sigusr2 = False;
-       }
-
-       if (do_sigchld) {
-               pid_t pid;
-
-               do_sigchld = False;
+bool winbindd_use_idmap_cache(void)
+{
+       return !opt_nocache;
+}
 
-               while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
-                       winbind_child_died(pid);
-               }
-       }
+bool winbindd_use_cache(void)
+{
+       return !opt_nocache;
 }
 
 /* Main function */
@@ -1100,25 +1184,36 @@ int main(int argc, char **argv, char **envp)
        poptFreeContext(pc);
 
        if (!override_logfile) {
-               char *logfile = NULL;
-               if (asprintf(&logfile,"%s/log.winbindd",
+               char *lfile = NULL;
+               if (asprintf(&lfile,"%s/log.winbindd",
                                get_dyn_LOGFILEBASE()) > 0) {
-                       lp_set_logfile(logfile);
-                       SAFE_FREE(logfile);
+                       lp_set_logfile(lfile);
+                       SAFE_FREE(lfile);
                }
        }
        setup_logging("winbindd", log_stdout);
        reopen_logs();
 
-       DEBUG(0,("winbindd version %s started.\n", SAMBA_VERSION_STRING));
+       DEBUG(0,("winbindd version %s started.\n", samba_version_string()));
        DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
-       if (!reload_services_file()) {
+       if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
                DEBUG(0, ("error opening config file\n"));
                exit(1);
        }
 
-       if (!directory_exist(lp_lockdir(), NULL)) {
+       /* Initialise messaging system */
+
+       if (winbind_messaging_context() == NULL) {
+               exit(1);
+       }
+
+       if (!reload_services_file(NULL)) {
+               DEBUG(0, ("error opening config file\n"));
+               exit(1);
+       }
+
+       if (!directory_exist(lp_lockdir())) {
                mkdir(lp_lockdir(), 0755);
        }
 
@@ -1139,12 +1234,6 @@ int main(int argc, char **argv, char **envp)
 
        namecache_enable();
 
-       /* Winbind daemon initialisation */
-
-       if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) {
-               DEBUG(1, ("Could not init idmap cache!\n"));            
-       }
-
        /* Unblock all signals we are interested in as they may have been
           blocked by the parent process. */
 
@@ -1156,18 +1245,6 @@ int main(int argc, char **argv, char **envp)
        BlockSignals(False, SIGHUP);
        BlockSignals(False, SIGCHLD);
 
-       /* Setup signal handlers */
-       
-       CatchSignal(SIGINT, termination_handler);      /* Exit on these sigs */
-       CatchSignal(SIGQUIT, termination_handler);
-       CatchSignal(SIGTERM, termination_handler);
-       CatchSignal(SIGCHLD, sigchld_handler);
-
-       CatchSignal(SIGPIPE, SIG_IGN);                 /* Ignore sigpipe */
-
-       CatchSignal(SIGUSR2, sigusr2_handler);         /* Debugging sigs */
-       CatchSignal(SIGHUP, sighup_handler);
-
        if (!interactive)
                become_daemon(Fork, no_process_group);
 
@@ -1184,26 +1261,41 @@ int main(int argc, char **argv, char **envp)
 
        TimeInit();
 
-       /* Initialise messaging system */
+       /* Don't use winbindd_reinit_after_fork here as
+        * we're just starting up and haven't created any
+        * winbindd-specific resources we must free yet. JRA.
+        */
 
-       if (winbind_messaging_context() == NULL) {
-               DEBUG(0, ("unable to initialize messaging system\n"));
+       if (!reinit_after_fork(winbind_messaging_context(),
+                              winbind_event_context(), false)) {
+               DEBUG(0,("reinit_after_fork() failed\n"));
                exit(1);
        }
 
+       /* 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
-        * before we startup.
+        * and initialized before we startup.
         */
-       if (winbindd_validate_cache() < 0) {
-               DEBUG(0, ("corrupted tdb found, trying to restore backup\n"));
-       }
-
-       /* Initialize cache (ensure version is correct). */
-       if (!initialize_winbindd_cache()) {
+       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,
@@ -1226,14 +1318,23 @@ int main(int argc, char **argv, char **envp)
                           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 initalize domain list\n"));
+               DEBUG(0,("unable to initialize domain list\n"));
                exit(1);
        }
 
@@ -1247,8 +1348,29 @@ int main(int argc, char **argv, char **envp)
 
        TALLOC_FREE(frame);
        while (1) {
+               struct winbindd_cli_state *state;
+
                frame = talloc_stackframe();
+
+               /* refresh the trusted domain cache */
+
+               rescan_trusted_domains();
+
+               /* Dispose of client connection if it is marked as
+                  finished */
+               state = winbindd_client_list();
+               while (state) {
+                       struct winbindd_cli_state *next = state->next;
+
+                       if (state->finished) {
+                               remove_client(state);
+                       }
+
+                       state = next;
+               }
+
                process_loop();
+
                TALLOC_FREE(frame);
        }