Changeset 740 for vendor/current/source3/winbindd/winbindd.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/winbindd/winbindd.c (modified) (30 diffs)

vendor/current/source3/winbindd/winbindd.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "popt_common.h"
 #include "winbindd.h"
-#include "../../nsswitch/libwbclient/wbc_async.h"
+#include "nsswitch/winbind_client.h"
+#include "nsswitch/wb_reqtrans.h"
+#include "ntdomain.h"
+#include "../librpc/gen_ndr/srv_lsa.h"
+#include "../librpc/gen_ndr/srv_samr.h"
+#include "secrets.h"
+#include "idmap.h"
+#include "lib/addrchange.h"
+#include "serverid.h"
+#include "auth.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+static bool client_is_idle(struct winbindd_cli_state *state);
 static void remove_client(struct winbindd_cli_state *state);
 
@@ -37 +49 @@
 extern bool override_logfile;
 
-struct event_context *winbind_event_context(void)
-{
-        static struct event_context *ctx;
-
-        if (!ctx && !(ctx = event_context_init(NULL))) {
-                smb_panic("Could not init winbind event context");
-        }
-        return ctx;
-}
-
 struct messaging_context *winbind_messaging_context(void)
 {
-        static struct messaging_context *ctx;
-
-        if (ctx == NULL) {
-                ctx = messaging_init(NULL, server_id_self(),
-                                     winbind_event_context());
-        }
-        if (ctx == NULL) {
-                DEBUG(0, ("Could not init winbind messaging context.\n"));
-        }
-        return ctx;
+        struct messaging_context *msg_ctx = server_messaging_context();
+        if (likely(msg_ctx != NULL)) {
+                return msg_ctx;
+        }
+        smb_panic("Could not init winbindd's messaging context.\n");
+        return NULL;
 }
 
@@ -113 +111 @@
                 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();
+                        DEBUGADD(2, ("\t\tpid %lu, sock %d (%s)\n",
+                                     (unsigned long)tmp->pid, tmp->sock,
+                                     client_is_idle(tmp) ? "idle" : "active"));
+                }
+        }
 }
 
@@ -135 +127 @@
 
         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()) {
@@ -177 +192 @@
 
         if (is_parent) {
+                serverid_deregister(procid_self());
                 pidfile_unlink();
         }
@@ -255 +271 @@
 
         DEBUG(1,("Reloading services after SIGHUP\n"));
-        flush_caches();
+        flush_caches_noinit();
         reload_services_file(file);
 }
@@ -321 +337 @@
                                       void *private_data)
 {
-        print_winbindd_status();
+        winbindd_status();
 }
 
@@ -373 +389 @@
         uint8 ret;
         pid_t child_pid;
+        NTSTATUS status;
 
         DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache "
@@ -399 +416 @@
         /* child */
 
-        if (!winbindd_reinit_after_fork(NULL)) {
+        status = winbindd_reinit_after_fork(NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1, ("winbindd_reinit_after_fork failed: %s\n",
+                          nt_errstr(status)));
                 _exit(0);
         }
@@ -419 +439 @@
 } dispatch_table[] = {
 
-        /* PAM auth functions */
-
-        { WINBINDD_PAM_AUTH, winbindd_pam_auth, "PAM_AUTH" },
-        { WINBINDD_PAM_AUTH_CRAP, winbindd_pam_auth_crap, "AUTH_CRAP" },
-        { WINBINDD_PAM_CHAUTHTOK, winbindd_pam_chauthtok, "CHAUTHTOK" },
-        { WINBINDD_PAM_LOGOFF, winbindd_pam_logoff, "PAM_LOGOFF" },
-        { WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP, winbindd_pam_chng_pswd_auth_crap, "CHNG_PSWD_AUTH_CRAP" },
-
         /* Enumeration functions */
 
@@ -439 +451 @@
         { WINBINDD_DOMAIN_NAME, winbindd_domain_name, "DOMAIN_NAME" },
         { WINBINDD_DOMAIN_INFO, winbindd_domain_info, "DOMAIN_INFO" },
+        { WINBINDD_DC_INFO, winbindd_dc_info, "DC_INFO" },
         { WINBINDD_NETBIOS_NAME, winbindd_netbios_name, "NETBIOS_NAME" },
         { WINBINDD_PRIV_PIPE_DIR, winbindd_priv_pipe_dir,
@@ -473 +486 @@
         { WINBINDD_LOOKUPSID, "LOOKUPSID",
           winbindd_lookupsid_send, winbindd_lookupsid_recv },
+        { WINBINDD_LOOKUPSIDS, "LOOKUPSIDS",
+          winbindd_lookupsids_send, winbindd_lookupsids_recv },
         { WINBINDD_LOOKUPNAME, "LOOKUPNAME",
           winbindd_lookupname_send, winbindd_lookupname_recv },
@@ -483 +498 @@
         { WINBINDD_GID_TO_SID, "GID_TO_SID",
           winbindd_gid_to_sid_send, winbindd_gid_to_sid_recv },
+        { WINBINDD_SIDS_TO_XIDS, "SIDS_TO_XIDS",
+          winbindd_sids_to_xids_send, winbindd_sids_to_xids_recv },
         { WINBINDD_GETPWSID, "GETPWSID",
           winbindd_getpwsid_send, winbindd_getpwsid_recv },
@@ -529 +546 @@
         { 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 }
@@ -538 +564 @@
         { 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 }
@@ -557 +579 @@
         struct winbindd_async_dispatch_table *atable;
 
-        state->mem_ctx = talloc_init("winbind request");
+        state->mem_ctx = talloc_named(state, 0, "winbind request");
         if (state->mem_ctx == NULL)
                 return;
@@ -713 +735 @@
         }
 
-        DEBUG(10,("winbind_client_response_written[%d:%s]: deliverd response to client\n",
-                  (int)state->pid, state->cmd_name));
+        DEBUG(10,("winbind_client_response_written[%d:%s]: delivered response "
+                  "to client\n", (int)state->pid, state->cmd_name));
 
         TALLOC_FREE(state->mem_ctx);
@@ -758 +780 @@
         len = sizeof(sunaddr);
 
-        do {
-                sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr,
-                              &len);
-        } while (sock == -1 && errno == EINTR);
-
-        if (sock == -1)
-                return;
+        sock = accept(listen_sock, (struct sockaddr *)(void *)&sunaddr, &len);
+
+        if (sock == -1) {
+                if (errno != EINTR) {
+                        DEBUG(0, ("Faild to accept socket - %s\n",
+                                  strerror(errno)));
+                }
+                return;
+        }
 
         DEBUG(6,("accepted socket %d\n", sock));
@@ -862 +886 @@
 }
 
+/* Is a client idle? */
+
+static bool client_is_idle(struct winbindd_cli_state *state) {
+  return (state->response == NULL &&
+          !state->pwent_state && !state->grent_state);
+}
+
 /* Shutdown client connection which has been idle for the longest time */
 
@@ -871 +902 @@
 
         for (state = winbindd_client_list(); state; state = state->next) {
-                if (state->response == NULL &&
-                    !state->pwent_state && !state->grent_state) {
+                if (client_is_idle(state)) {
                         nidle++;
                         if (!last_access || state->last_access < last_access) {
@@ -904 +934 @@
                                           struct winbindd_listen_state);
 
-        while (winbindd_num_clients() >
-               WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+        while (winbindd_num_clients() > lp_winbind_max_clients() - 1) {
                 DEBUG(5,("winbindd: Exceeding %d client "
                          "connections, removing idle "
-                         "connection.\n",
-                         WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                         "connection.\n", lp_winbind_max_clients()));
                 if (!remove_idle_client()) {
                         DEBUG(0,("winbindd: Exceeding %d "
                                  "client connections, no idle "
                                  "connection found\n",
-                                 WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                                 lp_winbind_max_clients()));
                         break;
                 }
         }
         new_connection(s->fd, s->privileged);
+}
+
+/*
+ * Winbindd socket accessor functions
+ */
+
+const char *get_winbind_pipe_dir(void)
+{
+        return lp_parm_const_string(-1, "winbindd", "socket dir", WINBINDD_SOCKET_DIR);
+}
+
+char *get_winbind_priv_pipe_dir(void)
+{
+        return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR);
 }
 
@@ -934 +976 @@
 
         pub_state->privileged = false;
-        pub_state->fd = open_winbindd_socket();
+        pub_state->fd = create_pipe_sock(
+                get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
         if (pub_state->fd == -1) {
                 goto failed;
@@ -955 +998 @@
 
         priv_state->privileged = true;
-        priv_state->fd = open_winbindd_priv_socket();
+        priv_state->fd = create_pipe_sock(
+                get_winbind_priv_pipe_dir(), WINBINDD_SOCKET_NAME, 0750);
         if (priv_state->fd == -1) {
                 goto failed;
@@ -984 +1028 @@
 {
         return !opt_nocache;
+}
+
+void winbindd_register_handlers(void)
+{
+        /* Setup signal handlers */
+
+        if (!winbindd_setup_sig_term_handler(true))
+                exit(1);
+        if (!winbindd_setup_sig_hup_handler(NULL))
+                exit(1);
+        if (!winbindd_setup_sig_chld_handler())
+                exit(1);
+        if (!winbindd_setup_sig_usr2_handler())
+                exit(1);
+
+        CatchSignal(SIGPIPE, SIG_IGN);                 /* Ignore sigpipe */
+
+        /*
+         * Ensure all cache and idmap caches are consistent
+         * and initialized before we startup.
+         */
+        if (!winbindd_cache_validate_and_initialize()) {
+                exit(1);
+        }
+
+        /* get broadcast messages */
+
+        if (!serverid_register(procid_self(),
+                               FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP)) {
+                DEBUG(1, ("Could not register myself in serverid.tdb\n"));
+                exit(1);
+        }
+
+        /* React on 'smbcontrol winbindd reload-config' in the same way
+           as to SIGHUP signal */
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_SMB_CONF_UPDATED, msg_reload_services);
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_SHUTDOWN, msg_shutdown);
+
+        /* Handle online/offline messages. */
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_OFFLINE, winbind_msg_offline);
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_ONLINE, winbind_msg_online);
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
+
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
+
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_VALIDATE_CACHE,
+                           winbind_msg_validate_cache);
+
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_DUMP_DOMAIN_LIST,
+                           winbind_msg_dump_domain_list);
+
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_WINBIND_IP_DROPPED,
+                           winbind_msg_ip_dropped_parent);
+
+        /* Register handler for MSG_DEBUG. */
+        messaging_register(winbind_messaging_context(), NULL,
+                           MSG_DEBUG,
+                           winbind_msg_debug);
+
+        netsamlogon_cache_init(); /* Non-critical */
+
+        /* clear the cached list of trusted domains */
+
+        wcache_tdc_clear();
+
+        if (!init_domain_list()) {
+                DEBUG(0,("unable to initialize domain list\n"));
+                exit(1);
+        }
+
+        init_idmap_child();
+        init_locator_child();
+
+        smb_nscd_flush_user_cache();
+        smb_nscd_flush_group_cache();
+
+        if (lp_allow_trusted_domains()) {
+                if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+                              rescan_trusted_domains, NULL) == NULL) {
+                        DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
+                        exit(1);
+                }
+        }
+
+}
+
+struct winbindd_addrchanged_state {
+        struct addrchange_context *ctx;
+        struct tevent_context *ev;
+        struct messaging_context *msg_ctx;
+};
+
+static void winbindd_addr_changed(struct tevent_req *req);
+
+static void winbindd_init_addrchange(TALLOC_CTX *mem_ctx,
+                                     struct tevent_context *ev,
+                                     struct messaging_context *msg_ctx)
+{
+        struct winbindd_addrchanged_state *state;
+        struct tevent_req *req;
+        NTSTATUS status;
+
+        state = talloc(mem_ctx, struct winbindd_addrchanged_state);
+        if (state == NULL) {
+                DEBUG(10, ("talloc failed\n"));
+                return;
+        }
+        state->ev = ev;
+        state->msg_ctx = msg_ctx;
+
+        status = addrchange_context_create(state, &state->ctx);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(10, ("addrchange_context_create failed: %s\n",
+                           nt_errstr(status)));
+                TALLOC_FREE(state);
+                return;
+        }
+        req = addrchange_send(state, ev, state->ctx);
+        if (req == NULL) {
+                DEBUG(0, ("addrchange_send failed\n"));
+                TALLOC_FREE(state);
+                return;
+        }
+        tevent_req_set_callback(req, winbindd_addr_changed, state);
+}
+
+static void winbindd_addr_changed(struct tevent_req *req)
+{
+        struct winbindd_addrchanged_state *state = tevent_req_callback_data(
+                req, struct winbindd_addrchanged_state);
+        enum addrchange_type type;
+        struct sockaddr_storage addr;
+        NTSTATUS status;
+
+        status = addrchange_recv(req, &type, &addr);
+        TALLOC_FREE(req);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(10, ("addrchange_recv failed: %s, stop listening\n",
+                           nt_errstr(status)));
+                TALLOC_FREE(state);
+                return;
+        }
+        if (type == ADDRCHANGE_DEL) {
+                char addrstr[INET6_ADDRSTRLEN];
+                DATA_BLOB blob;
+
+                print_sockaddr(addrstr, sizeof(addrstr), &addr);
+
+                DEBUG(3, ("winbindd: kernel (AF_NETLINK) dropped ip %s\n",
+                          addrstr));
+
+                blob = data_blob_const(addrstr, strlen(addrstr)+1);
+
+                status = messaging_send(state->msg_ctx,
+                                        messaging_server_id(state->msg_ctx),
+                                        MSG_WINBIND_IP_DROPPED, &blob);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(10, ("messaging_send failed: %s - ignoring\n",
+                                   nt_errstr(status)));
+                }
+        }
+        req = addrchange_send(state, state->ev, state->ctx);
+        if (req == NULL) {
+                DEBUG(0, ("addrchange_send failed\n"));
+                TALLOC_FREE(state);
+                return;
+        }
+        tevent_req_set_callback(req, winbindd_addr_changed, state);
 }
 
@@ -1013 +1234 @@
         poptContext pc;
         int opt;
-        TALLOC_CTX *frame = talloc_stackframe();
+        TALLOC_CTX *frame;
+        NTSTATUS status;
+
+        /*
+         * Do this before any other talloc operation
+         */
+        talloc_enable_null_tracking();
+        frame = talloc_stackframe();
 
         /* glibc (?) likes to print "User defined signal 1" and exit if a
@@ -1099 +1327 @@
                 }
         }
-        setup_logging("winbindd", log_stdout);
+        if (log_stdout) {
+                setup_logging("winbindd", DEBUG_STDOUT);
+        } else {
+                setup_logging("winbindd", DEBUG_FILE);
+        }
         reopen_logs();
 
@@ -1137 +1369 @@
                 return False;
         }
-
-        /* Enable netbios namecache */
-
-        namecache_enable();
 
         /* Unblock all signals we are interested in as they may have been
@@ -1154 +1382 @@
 
         if (!interactive)
-                become_daemon(Fork, no_process_group);
+                become_daemon(Fork, no_process_group, log_stdout);
 
         pidfile_create("winbindd");
@@ -1174 +1402 @@
          */
 
-        if (!NT_STATUS_IS_OK(reinit_after_fork(winbind_messaging_context(),
-                                               winbind_event_context(),
-                                               false))) {
+        status = reinit_after_fork(winbind_messaging_context(),
+                                   winbind_event_context(),
+                                   procid_self(), false);
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);
         }
 
-        /* Setup signal handlers */
-
-        if (!winbindd_setup_sig_term_handler(true))
-                exit(1);
-        if (!winbindd_setup_sig_hup_handler(NULL))
-                exit(1);
-        if (!winbindd_setup_sig_chld_handler())
-                exit(1);
-        if (!winbindd_setup_sig_usr2_handler())
-                exit(1);
-
-        CatchSignal(SIGPIPE, SIG_IGN);                 /* Ignore sigpipe */
-
-        /*
-         * Ensure all cache and idmap caches are consistent
-         * and initialized before we startup.
-         */
-        if (!winbindd_cache_validate_and_initialize()) {
-                exit(1);
-        }
-
-        /* get broadcast messages */
-        claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_DBWRAP);
-
-        /* React on 'smbcontrol winbindd reload-config' in the same way
-           as to SIGHUP signal */
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_SMB_CONF_UPDATED, msg_reload_services);
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_SHUTDOWN, msg_shutdown);
-
-        /* Handle online/offline messages. */
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_WINBIND_OFFLINE, winbind_msg_offline);
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_WINBIND_ONLINE, winbind_msg_online);
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
-
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
-
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_WINBIND_VALIDATE_CACHE,
-                           winbind_msg_validate_cache);
-
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_WINBIND_DUMP_DOMAIN_LIST,
-                           winbind_msg_dump_domain_list);
-
-        /* Register handler for MSG_DEBUG. */
-        messaging_register(winbind_messaging_context(), NULL,
-                           MSG_DEBUG,
-                           winbind_msg_debug);
-
-        netsamlogon_cache_init(); /* Non-critical */
-
-        /* clear the cached list of trusted domains */
-
-        wcache_tdc_clear();     
-
-        if (!init_domain_list()) {
-                DEBUG(0,("unable to initialize domain list\n"));
-                exit(1);
-        }
-
-        init_idmap_child();
-        init_locator_child();
-
-        smb_nscd_flush_user_cache();
-        smb_nscd_flush_group_cache();
+        winbindd_register_handlers();
+
+        status = init_system_info();
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1, ("ERROR: failed to setup system user info: %s.\n",
+                          nt_errstr(status)));
+                exit(1);
+        }
+
+        rpc_lsarpc_init(NULL);
+        rpc_samr_init(NULL);
+
+        winbindd_init_addrchange(NULL, winbind_event_context(),
+                                 winbind_messaging_context());
 
         /* setup listen sockets */
@@ -1258 +1430 @@
                 DEBUG(0,("winbindd_setup_listeners() failed\n"));
                 exit(1);
-        }
-
-        if (lp_allow_trusted_domains()) {
-                if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
-                              rescan_trusted_domains, NULL) == NULL) {
-                        DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
-                        exit(1);
-                }
         }