s3: only include gen_ndr headers where needed.
[kai/samba.git] / source3 / winbindd / winbindd.c
index fd467e2f135b85a63d27980312a4ba7cd514d51c..f651e6079b8c793db89116e07f322ed4641a9e6e 100644 (file)
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../../nsswitch/libwbclient/wbc_async.h"
+#include "librpc/gen_ndr/messaging.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -51,7 +52,7 @@ struct messaging_context *winbind_messaging_context(void)
        static struct messaging_context *ctx;
 
        if (ctx == NULL) {
-               ctx = messaging_init(NULL, server_id_self(),
+               ctx = messaging_init(NULL, procid_self(),
                                     winbind_event_context());
        }
        if (ctx == NULL) {
@@ -141,6 +142,29 @@ static void flush_caches(void)
        }
 }
 
+static void flush_caches_noinit(void)
+{
+       /*
+        * We need to invalidate cached user list entries on a SIGHUP
+         * otherwise cached access denied errors due to restrict anonymous
+         * hang around until the sequence number changes.
+        * NB
+        * Skip uninitialized domains when flush cache.
+        * If domain is not initialized, it means it is never
+        * used or never become online. look, wcache_invalidate_cache()
+        * -> get_cache() -> init_dc_connection(). It causes a lot of traffic
+        * for unused domains and large traffic for primay domain's DC if there
+        * are many domains..
+        */
+
+       if (!wcache_invalidate_cache_noinit()) {
+               DEBUG(0, ("invalidating the cache failed; revalidate the cache\n"));
+               if (!winbindd_cache_validate_and_initialize()) {
+                       exit(1);
+               }
+       }
+}
+
 /* Handle the signal by unlinking socket and exiting */
 
 static void terminate(bool is_parent)
@@ -163,6 +187,8 @@ static void terminate(bool is_parent)
 
        trustdom_cache_shutdown();
 
+       gencache_stabilize();
+
 #if 0
        if (interactive) {
                TALLOC_CTX *mem_ctx = talloc_init("end_description");
@@ -173,6 +199,11 @@ static void terminate(bool is_parent)
        }
 #endif
 
+       if (is_parent) {
+               serverid_deregister_self();
+               pidfile_unlink();
+       }
+
        exit(0);
 }
 
@@ -248,7 +279,7 @@ static void winbindd_sig_hup_handler(struct tevent_context *ev,
        const char *file = (const char *)private_data;
 
        DEBUG(1,("Reloading services after SIGHUP\n"));
-       flush_caches();
+       flush_caches_noinit();
        reload_services_file(file);
 }
 
@@ -366,8 +397,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"));
@@ -377,7 +406,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) {
@@ -395,16 +423,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));
@@ -419,70 +443,13 @@ static struct winbindd_dispatch_table {
        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" },
-       { WINBINDD_GETPWENT, winbindd_getpwent, "GETPWENT" },
-
-       { WINBINDD_GETGROUPS, winbindd_getgroups, "GETGROUPS" },
-       { WINBINDD_GETUSERSIDS, winbindd_getusersids, "GETUSERSIDS" },
-       { WINBINDD_GETUSERDOMGROUPS, winbindd_getuserdomgroups,
-         "GETUSERDOMGROUPS" },
-       { WINBINDD_GETSIDALIASES, winbindd_getsidaliases,
-          "LOOKUPUSERALIASES" },
-
-       /* Group functions */
-
-       { WINBINDD_GETGRNAM, winbindd_getgrnam, "GETGRNAM" },
-       { WINBINDD_GETGRGID, winbindd_getgrgid, "GETGRGID" },
-       { WINBINDD_SETGRENT, winbindd_setgrent, "SETGRENT" },
-       { WINBINDD_ENDGRENT, winbindd_endgrent, "ENDGRENT" },
-       { WINBINDD_GETGRENT, winbindd_getgrent, "GETGRENT" },
-       { WINBINDD_GETGRLST, winbindd_getgrent, "GETGRLST" },
-
-       /* 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_USERS, winbindd_list_users, "LIST_USERS" },
-       { WINBINDD_LIST_GROUPS, winbindd_list_groups, "LIST_GROUPS" },
        { WINBINDD_LIST_TRUSTDOM, winbindd_list_trusted_domains,
          "LIST_TRUSTDOM" },
-       { WINBINDD_SHOW_SEQUENCE, winbindd_show_sequence, "SHOW_SEQUENCE" },
-
-       /* SID related functions */
-
-       { WINBINDD_LOOKUPSID, winbindd_lookupsid, "LOOKUPSID" },
-       { WINBINDD_LOOKUPNAME, winbindd_lookupname, "LOOKUPNAME" },
-       { WINBINDD_LOOKUPRIDS, winbindd_lookuprids, "LOOKUPRIDS" },
-
-       /* Lookup related functions */
-
-       { WINBINDD_SID_TO_UID, winbindd_sid_to_uid, "SID_TO_UID" },
-       { 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" },
-       { 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 */
 
-       { WINBINDD_CHECK_MACHACC, winbindd_check_machine_acct, "CHECK_MACHACC" },
-       { WINBINDD_PING, winbindd_ping, "PING" },
        { WINBINDD_INFO, winbindd_info, "INFO" },
        { WINBINDD_INTERFACE_VERSION, winbindd_interface_version,
          "INTERFACE_VERSION" },
@@ -491,11 +458,10 @@ static struct winbindd_dispatch_table {
        { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
        { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
          "WINBINDD_PRIV_PIPE_DIR" },
-       { WINBINDD_GETDCNAME, winbindd_getdcname, "GETDCNAME" },
-       { WINBINDD_DSGETDCNAME, winbindd_dsgetdcname, "DSGETDCNAME" },
 
        /* Credential cache access */
        { WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
+       { WINBINDD_CCACHE_SAVE, winbindd_ccache_save, "CCACHE_SAVE" },
 
        /* WINS functions */
 
@@ -512,14 +478,101 @@ struct winbindd_async_dispatch_table {
        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, TALLOC_CTX *mem_ctx,
-                            struct winbindd_response **presp);
+       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 }
 };
@@ -531,11 +584,6 @@ static void process_request(struct winbindd_cli_state *state)
        struct winbindd_dispatch_table *table = dispatch_table;
        struct winbindd_async_dispatch_table *atable;
 
-       ZERO_STRUCT(state->response);
-
-       state->response.result = WINBINDD_PENDING;
-       state->response.length = sizeof(struct winbindd_response);
-
        state->mem_ctx = talloc_init("winbind request");
        if (state->mem_ctx == NULL)
                return;
@@ -543,6 +591,9 @@ static void process_request(struct winbindd_cli_state *state)
        /* 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) {
@@ -551,14 +602,26 @@ static void process_request(struct winbindd_cli_state *state)
                }
        }
 
+       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;
 
-               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->request);
+                                      state, state->request);
                if (req == NULL) {
                        DEBUG(0, ("process_request: atable->send failed for "
                                  "%s\n", atable->cmd_name));
@@ -566,14 +629,24 @@ 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;
        }
 
+       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;
                }
@@ -591,17 +664,28 @@ 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;
-       struct winbindd_response *response;
 
-       status = state->recv_fn(req, state->mem_ctx, &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;
+       }
+       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)) {
-               DEBUG(10, ("returning %s\n", nt_errstr(status)));
                request_error(state);
+               return;
        }
-       state->response = *response;
-       state->response.result = WINBINDD_PENDING;
-       state->response.length = sizeof(struct winbindd_response);
        request_ok(state);
 }
 
@@ -628,8 +712,10 @@ static void request_finished(struct winbindd_cli_state *state)
 
        req = wb_resp_write_send(state, winbind_event_context(),
                                 state->out_queue, state->sock,
-                                &state->response);
+                                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;
        }
@@ -646,13 +732,21 @@ static void winbind_client_response_written(struct tevent_req *req)
        ret = wb_resp_write_recv(req, &err);
        TALLOC_FREE(req);
        if (ret == -1) {
-               DEBUG(2, ("Could not write response to client: %s\n",
-                         strerror(err)));
+               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);
@@ -665,15 +759,15 @@ static void winbind_client_response_written(struct tevent_req *req)
 
 void request_error(struct winbindd_cli_state *state)
 {
-       SMB_ASSERT(state->response.result == WINBINDD_PENDING);
-       state->response.result = WINBINDD_ERROR;
+       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;
+       SMB_ASSERT(state->response->result == WINBINDD_PENDING);
+       state->response->result = WINBINDD_OK;
        request_finished(state);
 }
 
@@ -743,9 +837,17 @@ static void winbind_client_request_read(struct tevent_req *req)
        int err;
 
        ret = wb_req_read_recv(req, state, &state->request, &err);
+       TALLOC_FREE(req);
        if (ret == -1) {
-               DEBUG(2, ("Could not read client request: %s\n",
-                         strerror(err)));
+               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;
        }
@@ -765,27 +867,19 @@ static void remove_client(struct winbindd_cli_state *state)
                return;
        }
 
-       /* tell client, we are closing ... */
-       nwritten = write(state->sock, &c, sizeof(c));
-       if (nwritten == -1) {
-               /* 
-                * ignore EPIPE error here, because the other end might
-                * have already closed the socket.
-                */
-               if (errno != EPIPE) {
+       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)));
+                               strerror(errno)));
                }
-       }
-
-       /* Close socket */
 
-       close(state->sock);
+               /* Close socket */
 
-       /* Free any getent state */
-
-       free_getent_state(state->getpwent_state);
-       free_getent_state(state->getgrent_state);
+               close(state->sock);
+               state->sock = -1;
+       }
 
        TALLOC_FREE(state->mem_ctx);
 
@@ -804,8 +898,8 @@ static bool remove_idle_client(void)
        int nidle = 0;
 
        for (state = winbindd_client_list(); state; state = state->next) {
-               if (state->response.result != WINBINDD_PENDING &&
-                   !state->getpwent_state && !state->getgrent_state) {
+               if (state->response == NULL &&
+                   !state->pwent_state && !state->grent_state) {
                        nidle++;
                        if (!last_access || state->last_access < last_access) {
                                last_access = state->last_access;
@@ -909,73 +1003,6 @@ failed:
        return false;
 }
 
-/* Process incoming clients on listen_sock.  We use a tricky non-blocking,
-   non-forking, non-threaded model which allows us to handle many
-   simultaneous connections while remaining impervious to many denial of
-   service attacks. */
-
-static void process_loop(void)
-{
-       fd_set r_fds, w_fds;
-       int maxfd = 0, selret;
-       struct timeval timeout, ev_timeout;
-
-       run_events(winbind_event_context(), 0, NULL, NULL);
-
-       /* Initialise fd lists for select() */
-
-       FD_ZERO(&r_fds);
-       FD_ZERO(&w_fds);
-
-       timeout.tv_sec = WINBINDD_ESTABLISH_LOOP;
-       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);
-       }
-
-       /* Call select */
-
-       selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
-
-       if (selret == 0) {
-               goto no_fds_ready;
-       }
-
-       if (selret == -1) {
-               if (errno == EINTR) {
-                       goto no_fds_ready;
-               }
-
-               /* Select error, something is badly wrong */
-
-               perror("select");
-               exit(1);
-       }
-
-       /* selret > 0 */
-
-       run_events(winbind_event_context(), selret, &r_fds, &w_fds);
-
-       return;
-
- no_fds_ready:
-
-       run_events(winbind_event_context(), selret, &r_fds, &w_fds);
-
-#if 0
-       winbindd_check_cache_size(time(NULL));
-#endif
-}
-
 bool winbindd_use_idmap_cache(void)
 {
        return !opt_nocache;
@@ -1155,7 +1182,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");
 
@@ -1204,7 +1231,11 @@ int main(int argc, char **argv, char **envp)
        }
 
        /* get broadcast messages */
-       claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP);
+
+       if (!serverid_register_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 */
@@ -1273,7 +1304,11 @@ int main(int argc, char **argv, char **envp)
        while (1) {
                frame = talloc_stackframe();
 
-               process_loop();
+               if (tevent_loop_once(winbind_event_context()) == -1) {
+                       DEBUG(1, ("tevent_loop_once() failed: %s\n",
+                                 strerror(errno)));
+                       return 1;
+               }
 
                TALLOC_FREE(frame);
        }