diff options
| author | Günther Deschner <gd@samba.org> | 2005-09-12 11:56:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:35 -0500 |
| commit | 3ccb1913a771a187ee61a87869966beb7645f2f9 (patch) | |
| tree | 714b0169392463551dbb74505a19c048399b2aeb /source/sam | |
| parent | 6768c07bd1fc726f4cead361b00a5283af48eb77 (diff) | |
| download | samba-3ccb1913a771a187ee61a87869966beb7645f2f9.tar.gz samba-3ccb1913a771a187ee61a87869966beb7645f2f9.tar.xz samba-3ccb1913a771a187ee61a87869966beb7645f2f9.zip | |
r10170: Fix for #3056:
Allow to include BUILTIN to the mapping table also when
"allow trusted domains" is disabled.
Guenther
Diffstat (limited to 'source/sam')
| -rw-r--r-- | source/sam/idmap_rid.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/sam/idmap_rid.c b/source/sam/idmap_rid.c index a23da3e5789..0ba97946965 100644 --- a/source/sam/idmap_rid.c +++ b/source/sam/idmap_rid.c @@ -159,11 +159,10 @@ static NTSTATUS rid_idmap_get_domains(uint32 *num_domains, fstring **domain_name 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 @@ static NTSTATUS rid_idmap_get_domains(uint32 *num_domains, fstring **domain_name } 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 @@ static NTSTATUS rid_idmap_get_domains(uint32 *num_domains, fstring **domain_name 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())) { |