svn commit: samba r25261 - in branches/SAMBA_3_2_0/source/winbindd: .

metze at samba.org metze at samba.org
Thu Sep 20 18:37:48 GMT 2007


Author: metze
Date: 2007-09-20 18:37:45 +0000 (Thu, 20 Sep 2007)
New Revision: 25261

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25261

Log:
add trusted domains always to the end of the list.

Now BUILTIN is always the first domain followed
by the domain of our own SAM DB and the primary
domain (in member server mode).

metze
Modified:
   branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c
===================================================================
--- branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c	2007-09-20 18:37:34 UTC (rev 25260)
+++ branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c	2007-09-20 18:37:45 UTC (rev 25261)
@@ -187,7 +187,7 @@
 	}
 	
 	/* Link to domain list */
-	DLIST_ADD(_domain_list, domain);
+	DLIST_ADD_END(_domain_list, domain, struct winbindd_domain *);
         
 	wcache_tdc_add_domain( domain );
         
@@ -689,6 +689,25 @@
 	/* Free existing list */
 	free_domain_list();
 
+	/* BUILTIN domain */
+
+	domain = add_trusted_domain("BUILTIN", NULL, &passdb_methods,
+				    &global_sid_Builtin);
+	if (domain) {
+		setup_domain_child(domain, &domain->child, NULL);
+	}
+
+	/* Local SAM */
+
+	domain = add_trusted_domain(get_global_sam_name(), NULL,
+				    &passdb_methods, get_global_sam_sid());
+	if (domain) {
+		if ( role != ROLE_DOMAIN_MEMBER ) {
+			domain->primary = True;
+		}
+		setup_domain_child(domain, &domain->child, NULL);
+	}
+
 	/* Add ourselves as the first entry. */
 
 	if ( role == ROLE_DOMAIN_MEMBER ) {
@@ -715,25 +734,6 @@
 		}
 	}
 
-	/* Local SAM */
-
-	domain = add_trusted_domain(get_global_sam_name(), NULL,
-				    &passdb_methods, get_global_sam_sid());
-	if (domain) {
-		if ( role != ROLE_DOMAIN_MEMBER ) {
-			domain->primary = True;
-		}
-		setup_domain_child(domain, &domain->child, NULL);
-	}
-
-	/* BUILTIN domain */
-
-	domain = add_trusted_domain("BUILTIN", NULL, &passdb_methods,
-				    &global_sid_Builtin);
-	if (domain) {
-		setup_domain_child(domain, &domain->child, NULL);
-	}
-
 	return True;
 }
 



More information about the samba-cvs mailing list