r23040: Activate the winbindd cache validation code in the
[sfrench/samba-autobuild/.git] / source / nsswitch / winbindd.c
index 4b47ac13a2f3cbe3d149999ec636ba680078f57f..790d59c08656bf6a7c81c82ae1261cd9eee685d5 100644 (file)
@@ -6,6 +6,8 @@
    Copyright (C) by Tim Potter 2000-2002
    Copyright (C) Andrew Tridgell 2002
    Copyright (C) Jelmer Vernooij 2003
+   Copyright (C) Volker Lendecke 2004
+   Copyright (C) James Peach 2007
    
    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
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
 #include "winbindd.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
 BOOL opt_nocache = False;
-BOOL opt_dual_daemon = True;
+
+extern BOOL override_logfile;
+
+struct event_context *winbind_event_context(void)
+{
+       static struct event_context *ctx;
+
+       if (!ctx && !(ctx = event_context_init(NULL))) {
+               smb_panic("Could not init winbind event context\n");
+       }
+       return ctx;
+}
+
+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\n");
+       }
+       return ctx;
+}
 
 /* Reload configuration */
 
-static BOOL reload_services_file(BOOL test)
+static BOOL reload_services_file(void)
 {
        BOOL ret;
 
@@ -39,12 +67,11 @@ static BOOL reload_services_file(BOOL test)
                pstrcpy(fname,lp_configfile());
                if (file_exist(fname,NULL) && !strcsequal(fname,dyn_CONFIGFILE)) {
                        pstrcpy(dyn_CONFIGFILE,fname);
-                       test = False;
                }
        }
 
        reopen_logs();
-       ret = lp_load(dyn_CONFIGFILE,False,False,True);
+       ret = lp_load(dyn_CONFIGFILE,False,False,True,True);
 
        reopen_logs();
        load_interfaces();
@@ -53,55 +80,13 @@ static BOOL reload_services_file(BOOL test)
 }
 
 
-#if DUMP_CORE
-
-/**************************************************************************** **
- Prepare to dump a core file - carefully!
- **************************************************************************** */
-
-static BOOL dump_core(void)
-{
-       char *p;
-       pstring dname;
-       pstrcpy( dname, lp_logfile() );
-       if ((p=strrchr(dname,'/')))
-               *p=0;
-       pstrcat( dname, "/corefiles" );
-       mkdir( dname, 0700 );
-       sys_chown( dname, getuid(), getgid() );
-       chmod( dname, 0700 );
-       if ( chdir(dname) )
-               return( False );
-       umask( ~(0700) );
-#ifdef HAVE_GETRLIMIT
-#ifdef RLIMIT_CORE
-       {
-               struct rlimit rlp;
-               getrlimit( RLIMIT_CORE, &rlp );
-               rlp.rlim_cur = MAX( 4*1024*1024, rlp.rlim_cur );
-               setrlimit( RLIMIT_CORE, &rlp );
-               getrlimit( RLIMIT_CORE, &rlp );
-               DEBUG( 3, ( "Core limits now %d %d\n", (int)rlp.rlim_cur, (int)rlp.rlim_max ) );
-       }
-#endif
-#endif
-       DEBUG(0,("Dumping core in %s\n",dname));
-       abort();
-       return( True );
-} /* dump_core */
-#endif
-
 /**************************************************************************** **
  Handle a fault..
  **************************************************************************** */
 
 static void fault_quit(void)
 {
-#if DUMP_CORE
        dump_core();
-#endif
 }
 
 static void winbindd_status(void)
@@ -117,9 +102,8 @@ static void winbindd_status(void)
        if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
                DEBUG(2, ("\tclient list:\n"));
                for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
-                       DEBUG(2, ("\t\tpid %lu, sock %d, rbl %d, wbl %d\n",
-                                 (unsigned long)tmp->pid, tmp->sock, tmp->read_buf_len, 
-                                 tmp->write_buf_len));
+                       DEBUGADD(2, ("\t\tpid %lu, sock %d\n",
+                                 (unsigned long)tmp->pid, tmp->sock));
                }
        }
 }
@@ -129,19 +113,12 @@ static void winbindd_status(void)
 static void print_winbindd_status(void)
 {
        winbindd_status();
-       winbindd_cm_status();
 }
 
 /* Flush client cache */
 
 static void flush_caches(void)
 {
-#if 0
-       /* Clear cached user and group enumation info */        
-       if (!opt_dual_daemon) /* Until we have coherent cache flush. */
-               wcache_flush_cache();
-#endif
-
        /* 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. */
@@ -153,14 +130,22 @@ static void flush_caches(void)
 
 static void terminate(void)
 {
-       pstring path;
 
+       winbindd_release_sockets();
        idmap_close();
        
-       /* Remove socket file */
-       pstr_sprintf(path, "%s/%s", 
-                WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME);
-       unlink(path);
+       trustdom_cache_shutdown();
+
+#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
+
        exit(0);
 }
 
@@ -169,7 +154,7 @@ static BOOL do_sigterm;
 static void termination_handler(int signum)
 {
        do_sigterm = True;
-       sys_select_signal();
+       sys_select_signal(signum);
 }
 
 static BOOL do_sigusr2;
@@ -177,7 +162,7 @@ static BOOL do_sigusr2;
 static void sigusr2_handler(int signum)
 {
        do_sigusr2 = True;
-       sys_select_signal();
+       sys_select_signal(SIGUSR2);
 }
 
 static BOOL do_sighup;
@@ -185,30 +170,44 @@ static BOOL do_sighup;
 static void sighup_handler(int signum)
 {
        do_sighup = True;
-       sys_select_signal();
+       sys_select_signal(SIGHUP);
+}
+
+static BOOL do_sigchld;
+
+static void sigchld_handler(int signum)
+{
+       do_sigchld = True;
+       sys_select_signal(SIGCHLD);
 }
 
 /* React on 'smbcontrol winbindd reload-config' in the same way as on SIGHUP*/
-static void msg_reload_services(int msg_type, pid_t src, void *buf, size_t len)
+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(True);
+       reload_services_file();
 }
 
 /* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
-static void msg_shutdown(int msg_type, pid_t src, void *buf, size_t len)
+static void msg_shutdown(struct messaging_context *msg,
+                        void *private_data,
+                        uint32_t msg_type,
+                        struct server_id server_id,
+                        DATA_BLOB *data)
 {
-       terminate();
+       do_sigterm = True;
 }
 
-struct dispatch_table {
+static struct winbindd_dispatch_table {
        enum winbindd_cmd cmd;
-       enum winbindd_result (*fn)(struct winbindd_cli_state *state);
+       void (*fn)(struct winbindd_cli_state *state);
        const char *winbindd_cmd_name;
-};
-
-static struct dispatch_table dispatch_table[] = {
+} dispatch_table[] = {
        
        /* User functions */
 
@@ -220,6 +219,9 @@ static struct dispatch_table dispatch_table[] = {
        { WINBINDD_GETPWENT, winbindd_getpwent, "GETPWENT" },
 
        { WINBINDD_GETGROUPS, winbindd_getgroups, "GETGROUPS" },
+       { WINBINDD_GETUSERSIDS, winbindd_getusersids, "GETUSERSIDS" },
+       { WINBINDD_GETUSERDOMGROUPS, winbindd_getuserdomgroups,
+         "GETUSERDOMGROUPS" },
 
        /* Group functions */
 
@@ -235,50 +237,61 @@ static struct dispatch_table dispatch_table[] = {
        { 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_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_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
        { 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_SET_HWM, winbindd_set_hwm, "SET_HWMS" },
 
        /* Miscellaneous */
 
+       { WINBINDD_DUMP_MAPS, winbindd_dump_maps, "DUMP_MAPS" },
+
        { 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" },
+       { 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" },
+       { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
+         "WINBINDD_PRIV_PIPE_DIR" },
+       { WINBINDD_GETDCNAME, winbindd_getdcname, "GETDCNAME" },
+
+       /* Credential cache access */
+       { WINBINDD_CCACHE_NTLMAUTH, winbindd_ccache_ntlm_auth, "NTLMAUTH" },
 
        /* WINS functions */
 
        { WINBINDD_WINS_BYNAME, winbindd_wins_byname, "WINS_BYNAME" },
        { WINBINDD_WINS_BYIP, winbindd_wins_byip, "WINS_BYIP" },
        
-       /* UNIX account management functions */
-       { WINBINDD_CREATE_USER,                 winbindd_create_user,           "CREATE_USER"           },
-       { WINBINDD_CREATE_GROUP,                winbindd_create_group,          "CREATE_GROUP"          },
-       { WINBINDD_ADD_USER_TO_GROUP,           winbindd_add_user_to_group,     "ADD_USER_TO_GROUP"     },
-       { WINBINDD_REMOVE_USER_FROM_GROUP,      winbindd_remove_user_from_group,"REMOVE_USER_FROM_GROUP"},
-       { WINBINDD_SET_USER_PRIMARY_GROUP,      winbindd_set_user_primary_group,"SET_USER_PRIMARY_GROUP"},
-       { WINBINDD_DELETE_USER,                 winbindd_delete_user,           "DELETE_USER"           },
-       { WINBINDD_DELETE_GROUP,                winbindd_delete_group,          "DELETE_GROUP"          },
-       
        /* End of list */
 
        { WINBINDD_NUM_CMDS, NULL, "NONE" }
@@ -286,35 +299,319 @@ static struct dispatch_table dispatch_table[] = {
 
 static void process_request(struct winbindd_cli_state *state)
 {
-       struct dispatch_table *table = dispatch_table;
+       struct winbindd_dispatch_table *table = dispatch_table;
 
        /* Free response data - we may be interrupted and receive another
           command before being able to send this data off. */
 
-       SAFE_FREE(state->response.extra_data);  
+       SAFE_FREE(state->response.extra_data.data);  
 
        ZERO_STRUCT(state->response);
 
-       state->response.result = WINBINDD_ERROR;
+       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;
+
        /* Process command */
 
        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->response.result = table->fn(state);
+                       DEBUG(10,("process_request: request fn %s\n",
+                                 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 ));
+       if (!table->fn) {
+               DEBUG(10,("process_request: unknown request fn number %d\n",
+                         (int)state->request.cmd ));
+               request_error(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.
+ */
+
+static struct fd_event *fd_events = NULL;
+
+void add_fd_event(struct fd_event *ev)
+{
+       struct fd_event *match;
+
+       /* only add unique fd_event structs */
+
+       for (match=fd_events; match; match=match->next ) {
+#ifdef DEVELOPER
+               SMB_ASSERT( match != ev );
+#else
+               if ( match == ev )
+                       return;
+#endif
+       }
+
+       DLIST_ADD(fd_events, ev);
+}
+
+void remove_fd_event(struct fd_event *ev)
+{
+       DLIST_REMOVE(fd_events, ev);
+}
+
+/*
+ * Handler for 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)
+{
+       size_t todo;
+       ssize_t done = 0;
+
+       todo = event->length - event->done;
+
+       if (event->flags & EVENT_FD_WRITE) {
+               SMB_ASSERT(flags == EVENT_FD_WRITE);
+               done = sys_write(event->fd,
+                                &((char *)event->data)[event->done],
+                                todo);
+
+               if (done <= 0) {
+                       event->flags = 0;
+                       event->finished(event->private_data, False);
+                       return;
+               }
+       }
+
+       if (event->flags & EVENT_FD_READ) {
+               SMB_ASSERT(flags == EVENT_FD_READ);
+               done = sys_read(event->fd, &((char *)event->data)[event->done],
+                               todo);
+
+               if (done <= 0) {
+                       event->flags = 0;
+                       event->finished(event->private_data, False);
+                       return;
+               }
+       }
+
+       event->done += done;
+
+       if (event->done == event->length) {
+               event->flags = 0;
+               event->finished(event->private_data, True);
+       }
+}
+
+/*
+ * Request an async read/write on a 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 (*finished)(void *private_data, BOOL success),
+                     void *private_data)
+{
+       SMB_ASSERT(event->flags == 0);
+       event->data = data;
+       event->length = length;
+       event->done = 0;
+       event->handler = rw_callback;
+       event->finished = finished;
+       event->private_data = private_data;
+       event->flags = EVENT_FD_READ;
+}
+
+void setup_async_write(struct fd_event *event, void *data, size_t length,
+                      void (*finished)(void *private_data, BOOL success),
+                      void *private_data)
+{
+       SMB_ASSERT(event->flags == 0);
+       event->data = data;
+       event->length = length;
+       event->done = 0;
+       event->handler = rw_callback;
+       event->finished = finished;
+       event->private_data = private_data;
+       event->flags = EVENT_FD_WRITE;
+}
+
+/*
+ * 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_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);
+
+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;
+       }
+
+       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),
+                        request_len_recv, state);
+}
+
+static void response_main_sent(void *private_data, BOOL success)
+{
+       struct winbindd_cli_state *state =
+               talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+       if (!success) {
+               state->finished = True;
+               return;
+       }
+
+       if (state->response.length == sizeof(state->response)) {
+               if (state->mem_ctx != NULL) {
+                       talloc_destroy(state->mem_ctx);
+                       state->mem_ctx = NULL;
+               }
+
+               setup_async_read(&state->fd_event, &state->request,
+                                sizeof(uint32), request_len_recv, state);
+               return;
+       }
+
+       setup_async_write(&state->fd_event, state->response.extra_data.data,
+                         state->response.length - sizeof(state->response),
+                         response_extra_sent, state);
+}
+
+static void request_finished(struct winbindd_cli_state *state)
+{
+       setup_async_write(&state->fd_event, &state->response,
+                         sizeof(state->response), response_main_sent, state);
+}
 
-       /* In case extra data pointer is NULL */
+void request_error(struct winbindd_cli_state *state)
+{
+       SMB_ASSERT(state->response.result == WINBINDD_PENDING);
+       state->response.result = WINBINDD_ERROR;
+       request_finished(state);
+}
 
-       if (!state->response.extra_data)
-               state->response.length = sizeof(struct winbindd_response);
+void request_ok(struct winbindd_cli_state *state)
+{
+       SMB_ASSERT(state->response.result == WINBINDD_PENDING);
+       state->response.result = WINBINDD_OK;
+       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 =
+               talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+       if (!success) {
+               state->finished = True;
+               return;
+       }
+
+       if (*(uint32 *)(&state->request) != sizeof(state->request)) {
+               DEBUG(0,("request_len_recv: Invalid request size received: %d\n",
+                        *(uint32 *)(&state->request)));
+               state->finished = True;
+               return;
+       }
+
+       setup_async_read(&state->fd_event, (uint32 *)(&state->request)+1,
+                        sizeof(state->request) - sizeof(uint32),
+                        request_main_recv, state);
+}
+
+static void request_main_recv(void *private_data, BOOL success)
+{
+       struct winbindd_cli_state *state =
+               talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+       if (!success) {
+               state->finished = True;
+               return;
+       }
+
+       if (state->request.extra_len == 0) {
+               state->request.extra_data.data = NULL;
+               request_recv(state, True);
+               return;
+       }
+
+       if ((!state->privileged) &&
+           (state->request.extra_len > WINBINDD_MAX_EXTRA_DATA)) {
+               DEBUG(3, ("Got request with %d bytes extra data on "
+                         "unprivileged socket\n", (int)state->request.extra_len));
+               state->request.extra_data.data = NULL;
+               state->finished = True;
+               return;
+       }
+
+       state->request.extra_data.data =
+               SMB_MALLOC_ARRAY(char, state->request.extra_len + 1);
+
+       if (state->request.extra_data.data == NULL) {
+               DEBUG(0, ("malloc failed\n"));
+               state->finished = True;
+               return;
+       }
+
+       /* Ensure null termination */
+       state->request.extra_data.data[state->request.extra_len] = '\0';
+
+       setup_async_read(&state->fd_event, state->request.extra_data.data,
+                        state->request.extra_len, request_recv, state);
+}
+
+static void request_recv(void *private_data, BOOL success)
+{
+       struct winbindd_cli_state *state =
+               talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+       if (!success) {
+               state->finished = True;
+               return;
+       }
+
+       process_request(state);
 }
 
 /* Process a new connection by adding it to the client connection list */
@@ -341,17 +638,24 @@ static void new_connection(int listen_sock, BOOL privileged)
        
        /* Create new connection structure */
        
-       if ((state = (struct winbindd_cli_state *) 
-             malloc(sizeof(*state))) == NULL)
+       if ((state = TALLOC_ZERO_P(NULL, struct winbindd_cli_state)) == NULL) {
+               close(sock);
                return;
+       }
        
-       ZERO_STRUCTP(state);
        state->sock = sock;
 
        state->last_access = time(NULL);        
 
        state->privileged = privileged;
 
+       state->fd_event.fd = state->sock;
+       state->fd_event.flags = 0;
+       add_fd_event(&state->fd_event);
+
+       setup_async_read(&state->fd_event, &state->request, sizeof(uint32),
+                        request_len_recv, state);
+
        /* Add to connection list */
        
        winbindd_add_client(state);
@@ -363,30 +667,37 @@ static void remove_client(struct winbindd_cli_state *state)
 {
        /* It's a dead client - hold a funeral */
        
-       if (state != NULL) {
+       if (state == NULL) {
+               return;
+       }
                
-               /* Close socket */
+       /* Close socket */
                
-               close(state->sock);
+       close(state->sock);
                
-               /* Free any getent state */
+       /* Free any getent state */
                
-               free_getent_state(state->getpwent_state);
-               free_getent_state(state->getgrent_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 */
+       /* We may have some extra data that was not freed if the client was
+          killed unexpectedly */
+
+       SAFE_FREE(state->response.extra_data.data);
 
-               SAFE_FREE(state->response.extra_data);
+       if (state->mem_ctx != NULL) {
+               talloc_destroy(state->mem_ctx);
+               state->mem_ctx = NULL;
+       }
+
+       remove_fd_event(&state->fd_event);
                
-               /* Remove from list and free */
+       /* Remove from list and free */
                
-               winbindd_remove_client(state);
-               SAFE_FREE(state);
-       }
+       winbindd_remove_client(state);
+       TALLOC_FREE(state);
 }
 
-
 /* Shutdown client connection which has been idle for the longest time */
 
 static BOOL remove_idle_client(void)
@@ -396,8 +707,8 @@ static BOOL remove_idle_client(void)
        int nidle = 0;
 
        for (state = winbindd_client_list(); state; state = state->next) {
-               if (state->read_buf_len == 0 && state->write_buf_len == 0 &&
-                               !state->getpwent_state && !state->getgrent_state) {
+               if (state->response.result != WINBINDD_PENDING &&
+                   !state->getpwent_state && !state->getgrent_state) {
                        nidle++;
                        if (!last_access || state->last_access < last_access) {
                                last_access = state->last_access;
@@ -416,373 +727,256 @@ static BOOL remove_idle_client(void)
        return False;
 }
 
-/* Process a complete received packet from a client */
+/* 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. */
 
-void winbind_process_packet(struct winbindd_cli_state *state)
+static int process_loop(int listen_sock, int listen_priv_sock)
 {
-       /* Process request */
-       
-       /* Ensure null termination of entire request */
-       state->request.null_term = '\0';
+       struct winbindd_cli_state *state;
+       struct fd_event *ev;
+       fd_set r_fds, w_fds;
+       int maxfd, selret;
+       struct timeval timeout, ev_timeout;
 
-       state->pid = state->request.pid;
-       
-       process_request(state);
+       /* We'll be doing this a lot */
 
-       /* Update client state */
-       
-       state->read_buf_len = 0;
-       state->write_buf_len = sizeof(struct winbindd_response);
+       /* Handle messages */
 
-       /* we might need to send it to the dual daemon */
-       if (opt_dual_daemon) {
-               dual_send_request(state);
-       }
-}
+       message_dispatch();
 
-/* Read some data from a client connection */
+       run_events(winbind_event_context(), 0, NULL, NULL);
 
-void winbind_client_read(struct winbindd_cli_state *state)
-{
-       int n;
-    
-       /* Read data */
+       /* refresh the trusted domain cache */
 
-       n = sys_read(state->sock, state->read_buf_len + 
-                (char *)&state->request, 
-                sizeof(state->request) - state->read_buf_len);
-       
-       DEBUG(10,("client_read: read %d bytes. Need %ld more for a full request.\n", n, (unsigned long)(sizeof(state->request) - n - state->read_buf_len) ));
+       rescan_trusted_domains();
 
-       /* Read failed, kill client */
-       
-       if (n == -1 || n == 0) {
-               DEBUG(5,("read failed on sock %d, pid %lu: %s\n",
-                        state->sock, (unsigned long)state->pid, 
-                        (n == -1) ? strerror(errno) : "EOF"));
-               
-               state->finished = True;
-               return;
-       }
-       
-       /* Update client state */
-       
-       state->read_buf_len += n;
-       state->last_access = time(NULL);
-}
+       /* Free up temporary memory */
 
-/* Write some data to a client connection */
+       lp_TALLOC_FREE();
+       main_loop_TALLOC_FREE();
 
-static void client_write(struct winbindd_cli_state *state)
-{
-       char *data;
-       int num_written;
-       
-       /* Write some data */
-       /*
-        * The fancy calculation of data below allows us to handle the 
-        * case where write (sys_write) does not write all the data we 
-        * gave it. In that case, we will come back through here again
-        * because of the loop above us, and we want to pick up where
-        * we left off.
-        */
-       
-       if (!state->write_extra_data) {
-
-               /* Write response structure */
-               
-               data = (char *)&state->response + sizeof(state->response) - 
-                       state->write_buf_len;
+       /* Initialise fd lists for select() */
 
-       } else {
-
-               /* Write extra data */
-               
-               data = (char *)state->response.extra_data + 
-                       state->response.length - 
-                       sizeof(struct winbindd_response) - 
-                       state->write_buf_len;
-       }
-       
-       num_written = sys_write(state->sock, data, state->write_buf_len);
-       
-       DEBUG(10,("client_write: wrote %d bytes.\n", num_written ));
+       maxfd = MAX(listen_sock, listen_priv_sock);
 
-       /* Write failed, kill cilent */
-       
-       if (num_written == -1 || num_written == 0) {
-               
-               DEBUG(3,("write failed on sock %d, pid %lu: %s\n",
-                        state->sock, (unsigned long)state->pid, 
-                        (num_written == -1) ? strerror(errno) : "EOF"));
-               
-               state->finished = True;
+       FD_ZERO(&r_fds);
+       FD_ZERO(&w_fds);
+       FD_SET(listen_sock, &r_fds);
+       FD_SET(listen_priv_sock, &r_fds);
 
-               SAFE_FREE(state->response.extra_data);
+       timeout.tv_sec = WINBINDD_ESTABLISH_LOOP;
+       timeout.tv_usec = 0;
 
-               return;
+       /* Check for any event timeouts. */
+       if (get_timed_events_timeout(winbind_event_context(), &ev_timeout)) {
+               timeout = timeval_min(&timeout, &ev_timeout);
        }
-       
-       /* Update client state */
-       
-       state->write_buf_len -= num_written;
-       state->last_access = time(NULL);
 
-       /* Have we written all data? */
-       
-       if (state->write_buf_len == 0) {
-               
-               /* Take care of extra data */
-               
-               if (state->write_extra_data) {
+       /* Set up client readers and writers */
 
-                       SAFE_FREE(state->response.extra_data);
+       state = winbindd_client_list();
 
-                       state->write_extra_data = False;
+       while (state) {
 
-                       DEBUG(10,("client_write: client_write: complete response written.\n"));
+               struct winbindd_cli_state *next = state->next;
 
-               } else if (state->response.length > 
-                          sizeof(struct winbindd_response)) {
-                       
-                       /* Start writing extra data */
+               /* Dispose of client connection if it is marked as 
+                  finished */ 
 
-                       state->write_buf_len = 
-                               state->response.length -
-                               sizeof(struct winbindd_response);
-                       
-                       DEBUG(10,("client_write: need to write %d extra data bytes.\n", (int)state->write_buf_len));
+               if (state->finished)
+                       remove_client(state);
 
-                       state->write_extra_data = True;
-               }
+               state = next;
        }
-}
 
-/* 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)
-{
-       /* We'll be doing this a lot */
-
-       while (1) {
-               struct winbindd_cli_state *state;
-               fd_set r_fds, w_fds;
-               int maxfd, listen_sock, listen_priv_sock, selret;
-               struct timeval timeout;
-
-               /* Handle messages */
-
-               message_dispatch();
-
-               /* refresh the trusted domain cache */
-                  
-               rescan_trusted_domains();
-
-               /* Free up temporary memory */
-
-               lp_talloc_free();
-               main_loop_talloc_free();
-
-               /* Initialise fd lists for select() */
-
-               listen_sock = open_winbindd_socket();
-               listen_priv_sock = open_winbindd_priv_socket();
-
-               if (listen_sock == -1 || listen_priv_sock == -1) {
-                       perror("open_winbind_socket");
-                       exit(1);
+       for (ev = fd_events; ev; ev = ev->next) {
+               if (ev->flags & EVENT_FD_READ) {
+                       FD_SET(ev->fd, &r_fds);
+                       maxfd = MAX(ev->fd, maxfd);
                }
+               if (ev->flags & EVENT_FD_WRITE) {
+                       FD_SET(ev->fd, &w_fds);
+                       maxfd = MAX(ev->fd, maxfd);
+               }
+       }
 
-               maxfd = MAX(listen_sock, listen_priv_sock);
-
-               FD_ZERO(&r_fds);
-               FD_ZERO(&w_fds);
-               FD_SET(listen_sock, &r_fds);
-               FD_SET(listen_priv_sock, &r_fds);
+       /* Call select */
+        
+       selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
 
-               timeout.tv_sec = WINBINDD_ESTABLISH_LOOP;
-               timeout.tv_usec = 0;
+       if (selret == 0) {
+               goto no_fds_ready;
+       }
 
-               if (opt_dual_daemon) {
-                       maxfd = dual_select_setup(&w_fds, maxfd);
+       if (selret == -1) {
+               if (errno == EINTR) {
+                       goto no_fds_ready;
                }
 
-               /* Set up client readers and writers */
-
-               state = winbindd_client_list();
+               /* Select error, something is badly wrong */
 
-               while (state) {
-
-                       /* Dispose of client connection if it is marked as 
-                          finished */ 
+               perror("select");
+               exit(1);
+       }
 
-                       if (state->finished) {
-                               struct winbindd_cli_state *next = state->next;
+       /* selret > 0 */
+
+       ev = fd_events;
+       while (ev != NULL) {
+               struct fd_event *next = ev->next;
+               int flags = 0;
+               if (FD_ISSET(ev->fd, &r_fds))
+                       flags |= EVENT_FD_READ;
+               if (FD_ISSET(ev->fd, &w_fds))
+                       flags |= EVENT_FD_WRITE;
+               if (flags)
+                       ev->handler(ev, flags);
+               ev = next;
+       }
 
-                               remove_client(state);
-                               state = next;
-                               continue;
+       if (FD_ISSET(listen_sock, &r_fds)) {
+               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, 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) {
+                       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, privileged connection */
+               new_connection(listen_priv_sock, True);
+       }
 
-                       /* Select requires we know the highest fd used */
+ no_fds_ready:
 
-                       if (state->sock > maxfd)
-                               maxfd = state->sock;
+#if 0
+       winbindd_check_cache_size(time(NULL));
+#endif
 
-                       /* Add fd for reading */
+       /* Check signal handling things */
 
-                       if (state->read_buf_len != sizeof(state->request))
-                               FD_SET(state->sock, &r_fds);
+       if (do_sigterm)
+               terminate();
 
-                       /* Add fd for writing */
+       if (do_sighup) {
 
-                       if (state->write_buf_len)
-                               FD_SET(state->sock, &w_fds);
+               DEBUG(3, ("got SIGHUP\n"));
 
-                       state = state->next;
-               }
+               flush_caches();
+               reload_services_file();
 
-               /* Call select */
-        
-               selret = sys_select(maxfd + 1, &r_fds, &w_fds, NULL, &timeout);
+               do_sighup = False;
+       }
 
-               if (selret == 0)
-                       continue;
+       if (do_sigusr2) {
+               print_winbindd_status();
+               do_sigusr2 = False;
+       }
 
-               if ((selret == -1 && errno != EINTR) || selret == 0) {
+       if (do_sigchld) {
+               pid_t pid;
 
-                       /* Select error, something is badly wrong */
+               do_sigchld = False;
 
-                       perror("select");
-                       exit(1);
+               while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
+                       winbind_child_died(pid);
                }
+       }
 
-               /* Create a new connection if listen_sock readable */
-
-               if (selret > 0) {
 
-                       if (opt_dual_daemon) {
-                               dual_select(&w_fds);
-                       }
-
-                       if (FD_ISSET(listen_sock, &r_fds)) {
-                               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, 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) {
-                                       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, privileged connection */
-                               new_connection(listen_priv_sock, True);
-                       }
-            
-                       /* Process activity on client connections */
-            
-                       for (state = winbindd_client_list(); state; 
-                            state = state->next) {
-                
-                               /* Data available for reading */
-                
-                               if (FD_ISSET(state->sock, &r_fds)) {
-                    
-                                       /* Read data */
-                    
-                                       winbind_client_read(state);
-
-                                       /* 
-                                        * If we have the start of a
-                                        * packet, then check the
-                                        * length field to make sure
-                                        * the client's not talking
-                                        * Mock Swedish.
-                                        */
-
-                                       if (state->read_buf_len >= sizeof(uint32)
-                                           && *(uint32 *) &state->request != sizeof(state->request)) {
-                                               DEBUG(0,("process_loop: Invalid request size from pid %lu: %d bytes sent, should be %ld\n",
-                                                               (unsigned long)state->request.pid, *(uint32 *) &state->request, (unsigned long)sizeof(state->request)));
-
-                                               remove_client(state);
-                                               break;
-                                       }
-
-                                       /* A request packet might be 
-                                          complete */
-                    
-                                       if (state->read_buf_len == 
-                                           sizeof(state->request)) {
-                                               winbind_process_packet(state);
-                                       }
-                               }
-                
-                               /* Data available for writing */
-                
-                               if (FD_ISSET(state->sock, &w_fds))
-                                       client_write(state);
-                       }
-               }
-
-#if 0
-               winbindd_check_cache_size(time(NULL));
-#endif
+       return winbindd_num_clients();
+}
 
-               /* Check signal handling things */
+static void winbindd_process_loop(enum smb_server_mode server_mode)
+{
+       int idle_timeout_sec;
+       struct timeval starttime;
+       int listen_public, listen_priv;
+
+       errno = 0;
+       if (!winbindd_init_sockets(&listen_public, &listen_priv,
+                                   &idle_timeout_sec)) {
+               terminate();
+       }
 
-               if (do_sigterm)
-                       terminate();
+       starttime = timeval_current();
 
-               if (do_sighup) {
+       if (listen_public == -1 || listen_priv == -1) {
+               DEBUG(0, ("failed to open winbindd pipes: %s\n",
+                           errno ? strerror(errno) : "unknown error"));
+               terminate();
+       }
 
-                       DEBUG(3, ("got SIGHUP\n"));
+       for (;;) {
+               int clients = process_loop(listen_public, listen_priv);
 
-                       msg_reload_services(MSG_SMB_CONF_UPDATED, (pid_t) 0, NULL, 0);
-                       do_sighup = False;
+               /* Don't bother figuring out the idle time if we won't be
+                * timing out anyway.
+                */
+               if (idle_timeout_sec < 0) {
+                       continue;
                }
 
-               if (do_sigusr2) {
-                       print_winbindd_status();
-                       do_sigusr2 = False;
+               if (clients == 0 && server_mode == SERVER_MODE_FOREGROUND) {
+                       struct timeval now;
+
+                       now = timeval_current();
+                       if (timeval_elapsed2(&starttime, &now) >
+                               (double)idle_timeout_sec) {
+                               DEBUG(0, ("idle for %d secs, exitting\n",
+                                           idle_timeout_sec));
+                               terminate();
+                       }
+               } else {
+                       starttime = timeval_current();
                }
        }
 }
 
 /* Main function */
 
-struct winbindd_state server_state;   /* Server state information */
-
-int main(int argc, char **argv)
+int main(int argc, char **argv, char **envp)
 {
        pstring logfile;
-       static BOOL interactive = False;
-       static BOOL Fork = True;
-       static BOOL log_stdout = False;
+       BOOL log_stdout = False;
+       BOOL no_process_group = False;
+
+       enum smb_server_mode server_mode = SERVER_MODE_DAEMON;
+
        struct poptOption long_options[] = {
                POPT_AUTOHELP
                { "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
-               { "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Daemon in foreground mode" },
-               { "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" },
-               { "single-daemon", 'Y', POPT_ARG_VAL, &opt_dual_daemon, False, "Single daemon mode" },
-               { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" },
+               { "foreground", 'F', POPT_ARG_VAL, &server_mode, SERVER_MODE_FOREGROUND, "Daemon in foreground mode" },
+               { "no-process-group", 0, POPT_ARG_VAL, &no_process_group, True, "Don't create a new process group" },
+               { "interactive", 'i', POPT_ARG_VAL, &server_mode, SERVER_MODE_INTERACTIVE, "Interactive mode" },
+               { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, True, "Disable caching" },
                POPT_COMMON_SAMBA
                POPT_TABLEEND
        };
@@ -796,6 +990,9 @@ int main(int argc, char **argv)
        CatchSignal(SIGUSR2, SIG_IGN);
 
        fault_setup((void (*)(void *))fault_quit );
+       dump_core_setup("winbindd");
+
+       load_case_tables();
 
        /* Initialise for running in non-root mode */
 
@@ -806,44 +1003,51 @@ int main(int argc, char **argv)
        /* Set environment variable so we don't recursively call ourselves.
           This may also be useful interactively. */
 
-       setenv(WINBINDD_DONT_ENV, "1", 1);
+       if ( !winbind_off() ) {
+               DEBUG(0,("Failed to disable recusive winbindd calls.  Exiting.\n"));
+               exit(1);
+       }
 
        /* Initialise samba/rpc client stuff */
 
        pc = poptGetContext("winbindd", argc, (const char **)argv, long_options,
                                                POPT_CONTEXT_KEEP_FIRST);
 
-       while ((opt = poptGetNextOpt(pc)) != -1) {
-               switch (opt) {
-                       /* Don't become a daemon */
-               case 'i':
-                       interactive = True;
-                       log_stdout = True;
-                       Fork = False;
-                       break;
+       while ((opt = poptGetNextOpt(pc)) != -1) {}
+
+       if (server_mode == SERVER_MODE_INTERACTIVE) {
+               log_stdout = True;
+               if (DEBUGLEVEL >= 9) {
+                       talloc_enable_leak_report();
                }
        }
 
-
-       if (log_stdout && Fork) {
-               printf("Can't log to stdout (-S) unless daemon is in foreground +(-F) or interactive (-i)\n");
+       if (log_stdout && server_mode == SERVER_MODE_DAEMON) {
+               printf("Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n");
                poptPrintUsage(pc, stderr, 0);
                exit(1);
        }
 
-       pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
-       lp_set_logfile(logfile);
+       if (!override_logfile) {
+               pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
+               lp_set_logfile(logfile);
+       }
        setup_logging("winbindd", log_stdout);
        reopen_logs();
 
-       DEBUG(1, ("winbindd version %s started.\n", SAMBA_VERSION_STRING) );
-       DEBUGADD( 1, ( "Copyright The Samba Team 2000-2003\n" ) );
+       DEBUG(1, ("winbindd version %s started.\n%s\n", 
+                 SAMBA_VERSION_STRING, 
+                 COPYRIGHT_STARTUP_MESSAGE) );
 
-       if (!reload_services_file(False)) {
+       if (!reload_services_file()) {
                DEBUG(0, ("error opening config file\n"));
                exit(1);
        }
 
+       if (!directory_exist(lp_lockdir(), NULL)) {
+               mkdir(lp_lockdir(), 0755);
+       }
+
        /* Setup names. */
 
        if (!init_names())
@@ -861,20 +1065,11 @@ int main(int argc, char **argv)
 
        namecache_enable();
 
-       /* Check winbindd parameters are valid */
-
-       ZERO_STRUCT(server_state);
-
-       if (!winbindd_param_init())
-               return 1;
-
        /* Winbind daemon initialisation */
 
-       if (!winbindd_upgrade_idmap())
-               return 1;
-
-       if (!idmap_init(lp_idmap_backend()))
-               return 1;
+       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. */
@@ -885,57 +1080,102 @@ int main(int argc, char **argv)
        BlockSignals(False, SIGUSR1);
        BlockSignals(False, SIGUSR2);
        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);
+       if (server_mode == SERVER_MODE_DAEMON) {
+               DEBUG( 3, ( "Becoming a daemon.\n" ) );
+               become_daemon(True, no_process_group);
+       } else if (server_mode == SERVER_MODE_FOREGROUND) {
+               become_daemon(False, no_process_group);
+       }
 
        pidfile_create("winbindd");
 
+       /* Ensure all cache and idmap caches are consistent
+          before we startup. */
+
+       if (winbindd_validate_cache()) {
+               /* We have a bad cache, but luckily we
+                  just deleted it. Restart ourselves */
+               int i;
+               /* Ensure we have no open low fd's. */
+               for (i = 3; i < 100; i++) {
+                       close(i);
+               }
+               return execve(argv[0], argv, envp);
+       }
+
 #if HAVE_SETPGID
        /*
         * If we're interactive we want to set our own process group for
         * signal management.
         */
-       if (interactive)
+       if (server_mode == SERVER_MODE_INTERACTIVE && !no_process_group) {
                setpgid( (pid_t)0, (pid_t)0);
+       }
 #endif
 
-       if (opt_dual_daemon) {
-               do_dual_daemon();
-       }
+       TimeInit();
 
        /* Initialise messaging system */
 
-       if (!message_init()) {
-               DEBUG(0, ("unable to initialise messaging system\n"));
+       if (winbind_messaging_context() == NULL) {
+               DEBUG(0, ("unable to initialize messaging system\n"));
                exit(1);
        }
        
+       /* Initialize cache (ensure version is correct). */
+       if (!initialize_winbindd_cache()) {
+               exit(1);
+       }
+
        /* React on 'smbcontrol winbindd reload-config' in the same way
           as to SIGHUP signal */
-       message_register(MSG_SMB_CONF_UPDATED, msg_reload_services);
-       message_register(MSG_SHUTDOWN, msg_shutdown);
-       
+       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);
+
        poptFreeContext(pc);
 
        netsamlogon_cache_init(); /* Non-critical */
        
-       /* Loop waiting for requests */
+       /* clear the cached list of trusted domains */
 
-       process_loop();
+       wcache_tdc_clear();     
+       
+       if (!init_domain_list()) {
+               DEBUG(0,("unable to initalize domain list\n"));
+               exit(1);
+       }
 
-       trustdom_cache_shutdown();
+       init_idmap_child();
+
+       smb_nscd_flush_user_cache();
+       smb_nscd_flush_group_cache();
+
+       /* Loop waiting for requests */
+       winbindd_process_loop(server_mode);
 
        return 0;
 }