From 1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 12 Jul 2012 16:00:59 +0200 Subject: s3: rename sid_check_is_in_our_domain() to sid_check_is_in_our_sam() This does not check whether the given sid is in our domain, but but whether it belongs to the local sam, which is a different thing on a domain member server. Autobuild-User(master): Michael Adam Autobuild-Date(master): Thu Jul 12 18:36:02 CEST 2012 on sn-devel-104 --- source3/passdb/pdb_ldap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/passdb/pdb_ldap.c') diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 23793bf726..68ced934d3 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2724,7 +2724,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods, if (!string_to_sid(&sid, sidstr)) goto done; - if (!sid_check_is_in_our_domain(&sid)) { + if (!sid_check_is_in_our_sam(&sid)) { DEBUG(0, ("Inconsistent SAM -- group member uid not " "in our domain\n")); ret = NT_STATUS_INTERNAL_DB_CORRUPTION; @@ -3075,7 +3075,7 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods, break; case SID_NAME_ALIAS: - if (!sid_check_is_in_our_domain(&map->sid) + if (!sid_check_is_in_our_sam(&map->sid) && !sid_check_is_in_builtin(&map->sid) ) { DEBUG(3, ("Refusing to map sid %s as an alias, not in our domain\n", @@ -3487,7 +3487,7 @@ static NTSTATUS ldapsam_modify_aliasmem(struct pdb_methods *methods, type = SID_NAME_ALIAS; } - if (sid_check_is_in_our_domain(alias)) { + if (sid_check_is_in_our_sam(alias)) { type = SID_NAME_ALIAS; } @@ -3610,7 +3610,7 @@ static NTSTATUS ldapsam_enum_aliasmem(struct pdb_methods *methods, type = SID_NAME_ALIAS; } - if (sid_check_is_in_our_domain(alias)) { + if (sid_check_is_in_our_sam(alias)) { type = SID_NAME_ALIAS; } -- cgit