Changeset 228 for branches/samba-3.2.x/source/winbindd/winbindd_util.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/winbindd/winbindd_util.c (modified) (7 diffs)

branches/samba-3.2.x/source/winbindd/winbindd_util.c

@@ -110 +110 @@
         struct winbindd_domain *domain;
         const char *alternative_name = NULL;
-        
+        const char **ignored_domains, **dom;
+
+        ignored_domains = lp_parm_string_list(-1, "winbind", "ignore domains", NULL);
+        for (dom=ignored_domains; dom && *dom; dom++) {
+                if (gen_fnmatch(*dom, domain_name) == 0) {
+                        DEBUG(2,("Ignoring domain '%s'\n", domain_name));
+                        return NULL;
+                }
+        }
+
         /* ignore alt_name if we are not in an AD domain */
-        
+
         if ( (lp_security() == SEC_ADS) && alt_name && *alt_name) {
                 alternative_name = alt_name;
         }
-        
+
         /* We can't call domain_list() as this function is called from
            init_domain_list() and we'll get stuck in a loop. */
@@ -403 +412 @@
                 }
 
+                if (d == NULL) {
+                        continue;
+                }
+
                 DEBUG(10,("rescan_forest_root_trusts: Following trust path "
                           "for domain tree root %s (%s)\n",
@@ -466 +479 @@
                                                         &cache_methods,
                                                         &dom_list[i].sid );
+                        }
+
+                        if (d == NULL) {
+                                continue;
                         }
                         
@@ -1025 +1042 @@
 
         while(temp != NULL) {
-                struct getent_state *next;
+                struct getent_state *next = temp->next;
 
                 /* Free sam entries then list entry */
@@ -1031 +1048 @@
                 SAFE_FREE(state->sam_entries);
                 DLIST_REMOVE(state, state);
-                next = temp->next;
 
                 SAFE_FREE(temp);
@@ -1127 +1143 @@
         }
 
-        safe_strcpy(buf, user, *len);
+        safe_strcpy((char *)buf, user, *len);
 }
 
@@ -1180 +1196 @@
 }
 
+/**
+ * talloc version of fill_domain_username()
+ * return NULL on talloc failure.
+ */
+char *fill_domain_username_talloc(TALLOC_CTX *mem_ctx,
+                                  const char *domain,
+                                  const char *user,
+                                  bool can_assume)
+{
+        char *tmp_user, *name;
+
+        tmp_user = talloc_strdup(mem_ctx, user);
+        strlower_m(tmp_user);
+
+        if (can_assume && assume_domain(domain)) {
+                name = tmp_user;
+        } else {
+                name = talloc_asprintf(mem_ctx, "%s%c%s",
+                                       domain,
+                                       *lp_winbind_separator(),
+                                       tmp_user);
+                TALLOC_FREE(tmp_user);
+        }
+
+        return name;
+}
+
 /*
  * Winbindd socket accessor functions