svn commit: samba r10170 - branches/SAMBA_3_0/source/sam trunk/source/sam

[gd at samba.org]

Author: gd
Date: 2005-09-12 11:56:36 +0000 (Mon, 12 Sep 2005)
New Revision: 10170

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

Log:
Fix for #3056:

Allow to include BUILTIN to the mapping table also when 
"allow trusted domains" is disabled.

Guenther

Modified:
   branches/SAMBA_3_0/source/sam/idmap_rid.c
   trunk/source/sam/idmap_rid.c


Changeset:
Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_rid.c	2005-09-12 11:48:18 UTC (rev 10169)
+++ branches/SAMBA_3_0/source/sam/idmap_rid.c	2005-09-12 11:56:36 UTC (rev 10170)
@@ -159,11 +159,10 @@
 	char **trusted_domain_names;
 	DOM_SID *trusted_domain_sids;
 	uint32 enum_ctx = 0;
-	DOM_SID builtin_sid;
 	int own_domains = 2;
 
 	/* put the results together */
-	*num_domains = 1;
+	*num_domains = 2;
 	*domain_names = SMB_MALLOC_ARRAY(fstring, *num_domains);
 	*domain_sids = SMB_MALLOC_ARRAY(DOM_SID, *num_domains);
 
@@ -177,6 +176,10 @@
 		}
 		sid_copy(&(*domain_sids)[0], &sid);
 
+		/* add BUILTIN */
+		fstrcpy((*domain_names)[1], "BUILTIN");
+		sid_copy(&(*domain_sids)[1], &global_sid_Builtin);
+
 		return NT_STATUS_OK;
 	}
 
@@ -286,9 +289,8 @@
 	sid_copy(&(*domain_sids)[0], domain_sid);
 
 	/* then add BUILTIN */
-	string_to_sid(&builtin_sid, "S-1-5-32");
 	fstrcpy((*domain_names)[1], "BUILTIN");
-	sid_copy(&(*domain_sids)[1], &builtin_sid);
+	sid_copy(&(*domain_sids)[1], &global_sid_Builtin);
 
 	/* then add my local sid */
 	if (!sid_equal(domain_sid, get_global_sam_sid())) {

Modified: trunk/source/sam/idmap_rid.c
===================================================================
--- trunk/source/sam/idmap_rid.c	2005-09-12 11:48:18 UTC (rev 10169)
+++ trunk/source/sam/idmap_rid.c	2005-09-12 11:56:36 UTC (rev 10170)
@@ -160,11 +160,10 @@
 	char **trusted_domain_names;
 	DOM_SID *trusted_domain_sids;
 	uint32 enum_ctx = 0;
-	DOM_SID builtin_sid;
 	int own_domains = 2;
 
 	/* put the results together */
-	*num_domains = 1;
+	*num_domains = 2;
 	*domain_names = SMB_MALLOC_ARRAY(fstring, *num_domains);
 	*domain_sids = SMB_MALLOC_ARRAY(DOM_SID, *num_domains);
 
@@ -178,6 +177,10 @@
 		}
 		sid_copy(&(*domain_sids)[0], &sid);
 
+		/* add BUILTIN */
+		fstrcpy((*domain_names)[1], "BUILTIN");
+		sid_copy(&(*domain_sids)[1], &global_sid_Builtin);
+
 		return NT_STATUS_OK;
 	}
 
@@ -291,9 +294,8 @@
 	sid_copy(&(*domain_sids)[0], domain_sid);
 
 	/* then add BUILTIN */
-	string_to_sid(&builtin_sid, "S-1-5-32");
 	fstrcpy((*domain_names)[1], "BUILTIN");
-	sid_copy(&(*domain_sids)[1], &builtin_sid);
+	sid_copy(&(*domain_sids)[1], &global_sid_Builtin);
 
 	/* then add my local sid */
 	if (!sid_equal(domain_sid, get_global_sam_sid())) {