s3compat-only s3:winbindd Split event handlers from winbindd.c
[abartlet/samba.git/.git] / source3 / winbindd / winbindd.c
index 9efa8ed98453e17a94265ffe83f357905d7b014b..7551f0b8c014e3f5f2f757c99df7b8c73cb8c1c1 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"
 
 #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;
 
-/* Reload configuration */
-
-static bool reload_services_file(const char *lfile)
-{
-       bool ret;
-
-       if (lp_loaded()) {
-               const char *fname = lp_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);
-
-       reopen_logs();
-       load_interfaces();
-
-       return(ret);
-}
-
-
 /**************************************************************************** **
  Handle a fault..
  **************************************************************************** */
@@ -78,925 +49,6 @@ static void fault_quit(void)
        dump_core();
 }
 
-static void winbindd_status(void)
-{
-       struct winbindd_cli_state *tmp;
-
-       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) {
-                       DEBUGADD(2, ("\t\tpid %lu, sock %d\n",
-                                 (unsigned long)tmp->pid, tmp->sock));
-               }
-       }
-}
-
-/* Print winbindd status to log file */
-
-static void print_winbindd_status(void)
-{
-       winbindd_status();
-}
-
-/* Flush client cache */
-
-static void flush_caches(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. */
-
-       if (!wcache_invalidate_cache()) {
-               DEBUG(0, ("invalidating the cache failed; revalidate the cache\n"));
-               if (!winbindd_cache_validate_and_initialize()) {
-                       exit(1);
-               }
-       }
-}
-
-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)
-{
-       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);
-               }
-       }
-
-       idmap_close();
-
-       trustdom_cache_shutdown();
-
-       gencache_stabilize();
-
-#if 0
-       if (interactive) {
-               TALLOC_CTX *mem_ctx = talloc_init("end_description");
-               char *description = talloc_describe_all(mem_ctx);
-
-               DEBUG(3, ("tallocs left:\n%s\n", description));
-               talloc_destroy(mem_ctx);
-       }
-#endif
-
-       if (is_parent) {
-               serverid_deregister(procid_self());
-               pidfile_unlink();
-       }
-
-       exit(0);
-}
-
-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);
-}
-
-bool winbindd_setup_sig_term_handler(bool parent)
-{
-       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 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_noinit();
-       reload_services_file(file);
-}
-
-bool winbindd_setup_sig_hup_handler(const char *lfile)
-{
-       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 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 bool winbindd_setup_sig_chld_handler(void)
-{
-       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 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 bool winbindd_setup_sig_usr2_handler(void)
-{
-       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*/
-static void msg_reload_services(struct messaging_context *msg,
-                               void *private_data,
-                               uint32_t msg_type,
-                               struct server_id server_id,
-                               DATA_BLOB *data)
-{
-        /* Flush various caches */
-       flush_caches();
-       reload_services_file((const char *) private_data);
-}
-
-/* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
-static void msg_shutdown(struct messaging_context *msg,
-                        void *private_data,
-                        uint32_t msg_type,
-                        struct server_id server_id,
-                        DATA_BLOB *data)
-{
-       /* only the parent waits for this message */
-       DEBUG(0,("Got shutdown message\n"));
-       terminate(true);
-}
-
-
-static void winbind_msg_validate_cache(struct messaging_context *msg_ctx,
-                                      void *private_data,
-                                      uint32_t msg_type,
-                                      struct server_id server_id,
-                                      DATA_BLOB *data)
-{
-       uint8 ret;
-       pid_t child_pid;
-
-       DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache "
-                  "message.\n"));
-
-       /*
-        * call the validation code from a child:
-        * so we don't block the main winbindd and the validation
-        * code can safely use fork/waitpid...
-        */
-       child_pid = sys_fork();
-
-       if (child_pid == -1) {
-               DEBUG(1, ("winbind_msg_validate_cache: Could not fork: %s\n",
-                         strerror(errno)));
-               return;
-       }
-
-       if (child_pid != 0) {
-               /* parent */
-               DEBUG(5, ("winbind_msg_validate_cache: child created with "
-                         "pid %d.\n", (int)child_pid));
-               return;
-       }
-
-       /* child */
-
-       if (!winbindd_reinit_after_fork(NULL)) {
-               _exit(0);
-       }
-
-       /* install default SIGCHLD handler: validation code uses fork/waitpid */
-       CatchSignal(SIGCHLD, SIG_DFL);
-
-       ret = (uint8)winbindd_validate_cache_nobackup();
-       DEBUG(10, ("winbindd_msg_validata_cache: got return value %d\n", ret));
-       messaging_send_buf(msg_ctx, server_id, MSG_WINBIND_VALIDATE_CACHE, &ret,
-                          (size_t)1);
-       _exit(0);
-}
-
-static struct winbindd_dispatch_table {
-       enum winbindd_cmd cmd;
-       void (*fn)(struct winbindd_cli_state *state);
-       const char *winbindd_cmd_name;
-} dispatch_table[] = {
-
-       /* Enumeration functions */
-
-       { WINBINDD_LIST_TRUSTDOM, winbindd_list_trusted_domains,
-         "LIST_TRUSTDOM" },
-
-       /* Miscellaneous */
-
-       { WINBINDD_INFO, winbindd_info, "INFO" },
-       { WINBINDD_INTERFACE_VERSION, winbindd_interface_version,
-         "INTERFACE_VERSION" },
-       { WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
-       { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
-       { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
-       { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
-         "WINBINDD_PRIV_PIPE_DIR" },
-
-       /* Credential cache access */
-       { WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
-       { WINBINDD_CCACHE_SAVE, winbindd_ccache_save, "CCACHE_SAVE" },
-
-       /* WINS functions */
-
-       { WINBINDD_WINS_BYNAME, winbindd_wins_byname, "WINS_BYNAME" },
-       { WINBINDD_WINS_BYIP, winbindd_wins_byip, "WINS_BYIP" },
-
-       /* End of list */
-
-       { WINBINDD_NUM_CMDS, NULL, "NONE" }
-};
-
-struct winbindd_async_dispatch_table {
-       enum winbindd_cmd cmd;
-       const char *cmd_name;
-       struct tevent_req *(*send_req)(TALLOC_CTX *mem_ctx,
-                                      struct tevent_context *ev,
-                                      struct winbindd_cli_state *cli,
-                                      struct winbindd_request *request);
-       NTSTATUS (*recv_req)(struct tevent_req *req,
-                            struct winbindd_response *presp);
-};
-
-static struct winbindd_async_dispatch_table async_nonpriv_table[] = {
-       { WINBINDD_PING, "PING",
-         wb_ping_send, wb_ping_recv },
-       { WINBINDD_LOOKUPSID, "LOOKUPSID",
-         winbindd_lookupsid_send, winbindd_lookupsid_recv },
-       { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
-         winbindd_lookupname_send, winbindd_lookupname_recv },
-       { WINBINDD_SID_TO_UID, "SID_TO_UID",
-         winbindd_sid_to_uid_send, winbindd_sid_to_uid_recv },
-       { WINBINDD_SID_TO_GID, "SID_TO_GID",
-         winbindd_sid_to_gid_send, winbindd_sid_to_gid_recv },
-       { WINBINDD_UID_TO_SID, "UID_TO_SID",
-         winbindd_uid_to_sid_send, winbindd_uid_to_sid_recv },
-       { WINBINDD_GID_TO_SID, "GID_TO_SID",
-         winbindd_gid_to_sid_send, winbindd_gid_to_sid_recv },
-       { WINBINDD_GETPWSID, "GETPWSID",
-         winbindd_getpwsid_send, winbindd_getpwsid_recv },
-       { WINBINDD_GETPWNAM, "GETPWNAM",
-         winbindd_getpwnam_send, winbindd_getpwnam_recv },
-       { WINBINDD_GETPWUID, "GETPWUID",
-         winbindd_getpwuid_send, winbindd_getpwuid_recv },
-       { WINBINDD_GETSIDALIASES, "GETSIDALIASES",
-         winbindd_getsidaliases_send, winbindd_getsidaliases_recv },
-       { WINBINDD_GETUSERDOMGROUPS, "GETUSERDOMGROUPS",
-         winbindd_getuserdomgroups_send, winbindd_getuserdomgroups_recv },
-       { WINBINDD_GETGROUPS, "GETGROUPS",
-         winbindd_getgroups_send, winbindd_getgroups_recv },
-       { WINBINDD_SHOW_SEQUENCE, "SHOW_SEQUENCE",
-         winbindd_show_sequence_send, winbindd_show_sequence_recv },
-       { WINBINDD_GETGRGID, "GETGRGID",
-         winbindd_getgrgid_send, winbindd_getgrgid_recv },
-       { WINBINDD_GETGRNAM, "GETGRNAM",
-         winbindd_getgrnam_send, winbindd_getgrnam_recv },
-       { WINBINDD_GETUSERSIDS, "GETUSERSIDS",
-         winbindd_getusersids_send, winbindd_getusersids_recv },
-       { WINBINDD_LOOKUPRIDS, "LOOKUPRIDS",
-         winbindd_lookuprids_send, winbindd_lookuprids_recv },
-       { WINBINDD_SETPWENT, "SETPWENT",
-         winbindd_setpwent_send, winbindd_setpwent_recv },
-       { WINBINDD_GETPWENT, "GETPWENT",
-         winbindd_getpwent_send, winbindd_getpwent_recv },
-       { WINBINDD_ENDPWENT, "ENDPWENT",
-         winbindd_endpwent_send, winbindd_endpwent_recv },
-       { WINBINDD_DSGETDCNAME, "DSGETDCNAME",
-         winbindd_dsgetdcname_send, winbindd_dsgetdcname_recv },
-       { WINBINDD_GETDCNAME, "GETDCNAME",
-         winbindd_getdcname_send, winbindd_getdcname_recv },
-       { WINBINDD_SETGRENT, "SETGRENT",
-         winbindd_setgrent_send, winbindd_setgrent_recv },
-       { WINBINDD_GETGRENT, "GETGRENT",
-         winbindd_getgrent_send, winbindd_getgrent_recv },
-       { WINBINDD_ENDGRENT, "ENDGRENT",
-         winbindd_endgrent_send, winbindd_endgrent_recv },
-       { WINBINDD_LIST_USERS, "LIST_USERS",
-         winbindd_list_users_send, winbindd_list_users_recv },
-       { WINBINDD_LIST_GROUPS, "LIST_GROUPS",
-         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 },
-       { 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 }
-};
-
-static struct winbindd_async_dispatch_table async_priv_table[] = {
-       { WINBINDD_ALLOCATE_UID, "ALLOCATE_UID",
-         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)
-{
-       struct winbindd_dispatch_table *table = dispatch_table;
-       struct winbindd_async_dispatch_table *atable;
-
-       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) {
-               if (state->request->cmd == atable->cmd) {
-                       break;
-               }
-       }
-
-       if ((atable->send_req == NULL) && state->privileged) {
-               for (atable = async_priv_table; atable->send_req;
-                    atable += 1) {
-                       if (state->request->cmd == atable->cmd) {
-                               break;
-                       }
-               }
-       }
-
-       if (atable->send_req != NULL) {
-               struct tevent_req *req;
-
-               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);
-               if (req == NULL) {
-                       DEBUG(0, ("process_request: atable->send failed for "
-                                 "%s\n", atable->cmd_name));
-                       request_error(state);
-                       return;
-               }
-               tevent_req_set_callback(req, wb_request_done, state);
-               return;
-       }
-
-       state->response = talloc_zero(state->mem_ctx,
-                                     struct winbindd_response);
-       if (state->response == NULL) {
-               DEBUG(10, ("talloc failed\n"));
-               remove_client(state);
-               return;
-       }
-       state->response->result = WINBINDD_PENDING;
-       state->response->length = sizeof(struct winbindd_response);
-
-       for (table = dispatch_table; table->fn; table++) {
-               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;
-               }
-       }
-
-       if (!table->fn) {
-               DEBUG(10,("process_request: unknown request fn number %d\n",
-                         (int)state->request->cmd ));
-               request_error(state);
-       }
-}
-
-static void wb_request_done(struct tevent_req *req)
-{
-       struct winbindd_cli_state *state = tevent_req_callback_data(
-               req, struct winbindd_cli_state);
-       NTSTATUS status;
-
-       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;
-       }
-       state->response->result = WINBINDD_PENDING;
-       state->response->length = sizeof(struct winbindd_response);
-
-       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)) {
-               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) {
-               DEBUG(10,("request_finished[%d:%s]: wb_resp_write_send() failed\n",
-                         (int)state->pid, state->cmd_name));
-               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[%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);
-       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);
-       state->response->result = WINBINDD_ERROR;
-       request_finished(state);
-}
-
-void request_ok(struct winbindd_cli_state *state)
-{
-       SMB_ASSERT(state->response->result == WINBINDD_PENDING);
-       state->response->result = WINBINDD_OK;
-       request_finished(state);
-}
-
-/* Process a new connection by adding it to the client connection list */
-
-static void new_connection(int listen_sock, bool privileged)
-{
-       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);
-}
-
-static void winbind_client_request_read(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_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);
-}
-
-/* Remove a client connection from client connection list */
-
-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;
-       }
-
-       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)));
-               }
-
-               /* Close socket */
-
-               close(state->sock);
-               state->sock = -1;
-       }
-
-       TALLOC_FREE(state->mem_ctx);
-
-       /* Remove from list and free */
-
-       winbindd_remove_client(state);
-       TALLOC_FREE(state);
-}
-
-/* Shutdown client connection which has been idle for the longest time */
-
-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;
-                       }
-               }
-       }
-
-       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;
-       }
-
-       return False;
-}
-
-struct winbindd_listen_state {
-       bool privileged;
-       int fd;
-};
-
-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);
-}
-
-/*
- * 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;
-       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;
-       }
-
-       pub_state->privileged = false;
-       pub_state->fd = create_pipe_sock(
-               get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
-       if (pub_state->fd == -1) {
-               goto failed;
-       }
-
-       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;
-       }
-       tevent_fd_set_auto_close(fde);
-
-       priv_state = talloc(winbind_event_context(),
-                           struct winbindd_listen_state);
-       if (!priv_state) {
-               goto failed;
-       }
-
-       priv_state->privileged = true;
-       priv_state->fd = create_pipe_sock(
-               get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750);
-       if (priv_state->fd == -1) {
-               goto failed;
-       }
-
-       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;
-       }
-       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;
@@ -1007,97 +59,6 @@ bool winbindd_use_cache(void)
        return !opt_nocache;
 }
 
-void winbindd_register_handlers(void)
-{
-       struct tevent_timer *te;
-       /* 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);
-
-       /* 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();
-
-       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);
-       }
-
-}
-
-/* Main function */
-
 int main(int argc, char **argv, char **envp)
 {
        static bool is_daemon = False;
@@ -1227,7 +188,7 @@ int main(int argc, char **argv, char **envp)
                exit(1);
        }
 
-       if (!reload_services_file(NULL)) {
+       if (!winbindd_reload_services_file(NULL)) {
                DEBUG(0, ("error opening config file\n"));
                exit(1);
        }