diff options
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 7 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 8 | ||||
| -rw-r--r-- | source3/sam/idmap_util.c | 103 |
3 files changed, 3 insertions, 115 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index 9c81aef447..f0d3bc43ea 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -924,7 +924,6 @@ static BOOL enum_alias_memberships(const DOM_SID *member_sid, DOM_SID **aliases, int *num_aliases) { TALLOC_CTX *mem_ctx = talloc_init("enum_alias_memberships"); - DOM_SID builtin_sid; uint32 *rids = NULL; int i, num_rids = 0; @@ -948,15 +947,13 @@ static BOOL enum_alias_memberships(const DOM_SID *member_sid, add_sid_to_array(NULL, &alias_sid, aliases, num_aliases); } - string_to_sid(&builtin_sid, "S-1-5-32"); - - if (!pdb_enum_alias_memberships(mem_ctx, &builtin_sid, + if (!pdb_enum_alias_memberships(mem_ctx, &global_sid_Builtin, member_sid, 1, &rids, &num_rids)) goto done; for (i=0; i<num_rids; i++) { DOM_SID alias_sid; - sid_copy(&alias_sid, &builtin_sid); + sid_copy(&alias_sid, &global_sid_Builtin); sid_append_rid(&alias_sid, rids[i]); add_sid_to_array(NULL, &alias_sid, aliases, num_aliases); } diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 686caf19f3..68560c040e 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -91,13 +91,7 @@ static BOOL is_internal_domain(const DOM_SID *sid) if (sid == NULL) return False; - if (sid_compare_domain(sid, get_global_sam_sid()) == 0) - return True; - - if (sid_compare_domain(sid, &global_sid_Builtin) == 0) - return True; - - return False; + return (sid_check_is_domain(sid) || sid_check_is_builtin(sid)); } diff --git a/source3/sam/idmap_util.c b/source3/sam/idmap_util.c index f28e11cde7..41689f413b 100644 --- a/source3/sam/idmap_util.c +++ b/source3/sam/idmap_util.c @@ -190,106 +190,3 @@ NTSTATUS idmap_sid_to_gid(const DOM_SID *sid, gid_t *gid, uint32 flags) return ret; } - - -/*************************************************************************** - Check first, call set_mapping if it doesn't already exist. -***************************************************************************/ - -static NTSTATUS wellknown_id_init(DOM_SID *sid, unid_t id, int flags) -{ - unid_t storedid; - int qflags = flags | ID_QUERY_ONLY; - - if (!NT_STATUS_IS_OK(idmap_get_id_from_sid(&storedid, &qflags, sid))) { - return idmap_set_mapping(sid, id, flags); - } else { - if (flags == ID_USERID && id.uid != storedid.uid) { - DEBUG(0,("wellknown_id_init: WARNING ! Stored uid %u for SID %s is not the same as the requested uid %u\n", - (unsigned int)storedid.uid, sid_string_static(sid), (unsigned int)id.uid )); - DEBUG(0,("wellknown_id_init: Attempting to overwrite old mapping with new.\n")); - return idmap_set_mapping(sid, id, flags); - } else if (flags == ID_GROUPID && id.gid != storedid.gid) { - DEBUG(0,("wellknown_id_init: WARNING ! Stored gid %u for SID %s is not the same as the requested gid %u\n", - (unsigned int)storedid.gid, sid_string_static(sid), (unsigned int)id.gid )); - DEBUG(0,("wellknown_id_init: Attempting to overwrite old mapping with new.\n")); - return idmap_set_mapping(sid, id, flags); - } - } - return NT_STATUS_OK; -} - -/*************************************************************************** - Initialize idmap withWellknown SIDs like Guest, that are necessary - to make samba run properly. -***************************************************************************/ - -BOOL idmap_init_wellknown_sids(void) -{ - const char *guest_account = lp_guestaccount(); - struct passwd *pass; - GROUP_MAP *map=NULL; - int num_entries=0; - DOM_SID sid; - unid_t id; - fstring sid_string; - - if (!(guest_account && *guest_account)) { - DEBUG(1, ("NULL guest account!?!?\n")); - return False; - } - - pass = getpwnam_alloc(guest_account); - if (!pass) { - return False; - } - - /* Fill in the SID for the guest account. */ - id.uid = pass->pw_uid; - sid_copy(&sid, get_global_sam_sid()); - sid_append_rid(&sid, DOMAIN_USER_RID_GUEST); - - if (!NT_STATUS_IS_OK(wellknown_id_init(&sid, id, ID_USERID))) { - DEBUG(0, ("Failed to setup UID mapping for GUEST (%s) to (%u)\n", - sid_to_string(sid_string, &sid), (unsigned int)id.uid)); - passwd_free(&pass); - return False; - } - - /* check if DOMAIN_GROUP_RID_GUESTS SID is set, if not store the - * guest account gid as mapping */ - id.gid = pass->pw_gid; - sid_copy(&sid, get_global_sam_sid()); - sid_append_rid(&sid, DOMAIN_GROUP_RID_GUESTS); - if (!NT_STATUS_IS_OK(wellknown_id_init(&sid, id, ID_GROUPID))) { - DEBUG(0, ("Failed to setup GID mapping for Group DOMAIN GUESTS (%s) to (%u)\n", - sid_to_string(sid_string, &sid), (unsigned int)id.gid)); - passwd_free(&pass); - return False; - } - - passwd_free(&pass); - /* now fill in group mappings */ - if(pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries, ENUM_ONLY_MAPPED)) { - int i; - - for (i = 0; i < num_entries; i++) { - id.gid = map[i].gid; - wellknown_id_init(&map[i].sid, id, ID_GROUPID); - } - SAFE_FREE(map); - } - - /* Fill in the SID for the administrator account. */ - id.uid = 0; - sid_copy(&sid, get_global_sam_sid()); - sid_append_rid(&sid, DOMAIN_USER_RID_ADMIN); - - if (!NT_STATUS_IS_OK(wellknown_id_init(&sid, id, ID_USERID))) { - DEBUG(0, ("Failed to setup UID mapping for ADMINISTRATOR (%s) to (%u)\n", - sid_to_string(sid_string, &sid), (unsigned int)id.uid)); - return False; - } - - return True; -} |