Changeset 134 for branches/samba-3.0/source/nsswitch

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/nsswitch

Files:

• idmap.c (modified) (1 diff)
• winbindd.c (modified) (2 diffs)
• winbindd_cache.c (modified) (3 diffs)
• winbindd_cm.c (modified) (3 diffs)
• winbindd_dual.c (modified) (5 diffs)
• winbindd_proto.h (modified) (1 diff)

branches/samba-3.0/source/nsswitch/idmap.c

@@ -510 +510 @@
 
                 talloc_free(config_option);
+        }
+
+        /* on DCs we need to add idmap_tdb as the default backend if compat is
+         * defined (when the old implicit configuration is used)
+         * This is not done in the previous loop a on member server we exclude
+         * the local domain. But on a DC the local domain is the only domain
+         * available therefore we are left with no default domain */
+        if (((lp_server_role() == ROLE_DOMAIN_PDC) ||
+             (lp_server_role() == ROLE_DOMAIN_BDC)) &&
+            ((num_domains == 0) && (compat == 1))) {
+
+                dom = TALLOC_ZERO_P(idmap_ctx, struct idmap_domain);
+                IDMAP_CHECK_ALLOC(dom);
+
+                dom->name = talloc_strdup(dom, "__default__");
+                IDMAP_CHECK_ALLOC(dom->name);
+
+                dom->default_domain = True;
+                dom->readonly = False;
+
+                /* get the backend methods for this domain */
+                dom->methods = get_methods(backends, compat_backend);
+
+                if ( ! dom->methods) {
+                        ret = smb_probe_module("idmap", compat_backend);
+                        if (NT_STATUS_IS_OK(ret)) {
+                                dom->methods = get_methods(backends,
+                                                           compat_backend);
+                        }
+                }
+                if ( ! dom->methods) {
+                        DEBUG(0, ("ERROR: Could not get methods for "
+                                  "backend %s\n", compat_backend));
+                        ret = NT_STATUS_UNSUCCESSFUL;
+                        goto done;
+                }
+
+                /* now that we have methods,
+                 * set the destructor for this domain */
+                talloc_set_destructor(dom, close_domain_destructor);
+
+                dom->params = talloc_strdup(dom, compat_params);
+                IDMAP_CHECK_ALLOC(dom->params);
+
+                /* Finally instance a backend copy for this domain */
+                ret = dom->methods->init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        DEBUG(0, ("ERROR: Initialization failed for backend "
+                                  "%s (domain %s), deferred!\n",
+                                  compat_backend, dom->name));
+                }
+                idmap_domains = talloc_realloc(idmap_ctx, idmap_domains,
+                                                struct idmap_domain *, 2);
+                if ( ! idmap_domains) {
+                        DEBUG(0, ("Out of memory!\n"));
+                        ret = NT_STATUS_NO_MEMORY;
+                        goto done;
+                }
+                idmap_domains[num_domains] = dom;
+
+                def_dom_num = num_domains;
+
+                /* Bump counter to next available slot */
+
+                num_domains++;
+
+                DEBUG(10, ("Domain %s - Backend %s - %sdefault - %sreadonly\n",
+                                dom->name, compat_backend,
+                                dom->default_domain?"":"not ",
+                                dom->readonly?"":"not "));
         }
 

branches/samba-3.0/source/nsswitch/winbindd.c

@@ -719 +719 @@
 }
 
+/* check if HUP has been received and reload files */
+void winbind_check_sighup(void)
+{
+        if (do_sighup) {
+
+                DEBUG(3, ("got SIGHUP\n"));
+
+                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, NULL);
+                do_sighup = False;
+        }
+}
+
+/* check if TERM has been received */
+void winbind_check_sigterm(void)
+{
+        if (do_sigterm)
+                terminate();
+}
+
 /* Process incoming clients on listen_sock.  We use a tricky non-blocking,
    non-forking, non-threaded model which allows us to handle many
@@ -883 +902 @@
         /* Check signal handling things */
 
-        if (do_sigterm)
-                terminate();
-
-        if (do_sighup) {
-
-                DEBUG(3, ("got SIGHUP\n"));
-
-                msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, NULL);
-                do_sighup = False;
-        }
+        winbind_check_sigterm();
+        winbind_check_sighup();
 
         if (do_sigusr2) {

branches/samba-3.0/source/nsswitch/winbindd_cache.c

@@ -38 +38 @@
 extern struct winbindd_methods ads_methods;
 #endif
+extern struct winbindd_methods passdb_methods;
 
 /*
@@ -137 +138 @@
         /* We have to know what type of domain we are dealing with first. */
 
+        if (domain->internal) {
+                domain->backend = &passdb_methods;
+                domain->initialized = True;
+        }
         if ( !domain->initialized ) {
                 init_dc_connection( domain );
@@ -2118 +2123 @@
         /* and save it */
         refresh_sequence_number(domain, False);
-        wcache_save_password_policy(domain, status, policy);
+        if (NT_STATUS_IS_OK(status)) {
+                wcache_save_password_policy(domain, status, policy);
+        }
 
         return status;

branches/samba-3.0/source/nsswitch/winbindd_cm.c

@@ -721 +721 @@
                                          &machine_krb5_principal);
                 if (!NT_STATUS_IS_OK(result)) {
-                        goto done;
+                        goto anon_fallback;
                 }
 
@@ -803 +803 @@
                 }
         }
+
+ anon_fallback:
 
         /* Fall back to anonymous connection, this might fail later */
@@ -2028 +2030 @@
         NTSTATUS result;
 
-        uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
+        uint32 neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
         uint8  mach_pwd[16];
         uint32  sec_chan_type;

branches/samba-3.0/source/nsswitch/winbindd_dual.c

@@ -528 +528 @@
         }
 
+        /* This will be re-added in fork_domain_child() */
+
+        DLIST_REMOVE(children, child);
+        
         remove_fd_event(&child->event);
         close(child->event.fd);
@@ -893 +897 @@
         ZERO_STRUCT(state);
         state.pid = sys_getpid();
-
-        /* Stop zombies */
-        CatchChild();
 
         /* Ensure we don't process messages whilst we're
@@ -925 +926 @@
         /* Child */
 
+        /* Stop zombies in children */
+        CatchChild();
+
         state.sock = fdpair[0];
         close(fdpair[1]);
@@ -995 +999 @@
 
         if (child->domain && child->domain->internal && IS_DC) {
-                child->domain->internal = False;
                 child->domain->methods = &cache_methods;
                 child->domain->online = False;
@@ -1011 +1014 @@
                 lp_TALLOC_FREE();
                 main_loop_TALLOC_FREE();
+
+                /* check for signals */
+                winbind_check_sigterm();
+                winbind_check_sighup();
 
                 run_events(winbind_event_context(), 0, NULL, NULL);

branches/samba-3.0/source/nsswitch/winbindd_proto.h

@@ -19 +19 @@
 void request_ok(struct winbindd_cli_state *state);
 void request_finished_cont(void *private_data, BOOL success);
+void winbind_check_sighup(void);
+void winbind_check_sigterm(void);
 int main(int argc, char **argv, char **envp);