Attachment 1438 Details for Bug 3056 – fix to always allow to add id-range for builtin

[patch] fix to always allow to add id-range for builtin

samba3-builtin-idmap_rid.diff (text/plain), 1.06 KB, created by Guenther Deschner on 2005-09-12 04:58:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2005-09-12 04:58:16 UTC

Size: 1.06 KB

patch

obsolete

>Index: sam/idmap_rid.c
>===================================================================
>--- sam/idmap_rid.c	(revision 10162)
>+++ sam/idmap_rid.c	(working copy)
>@@ -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())) {

Actions: View

Attachments on bug 3056: 1438