char *gr_mem;
DOM_SID group_sid;
struct winbindd_domain *domain;
- char *domain_name_idmap;
/* Do we need to fetch another chunk of groups? */
sid_copy(&group_sid, &domain->sid);
sid_append_rid(&group_sid, name_list[ent->sam_entry_index].rid);
- domain_name_idmap = domain->have_idmap_config
- ? domain->name
- : "";
-
- if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain_name_idmap,
+ if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config
+ ? domain->name : "",
&group_sid, &group_gid)))
{
union unid_t id;
char *mapped_name = NULL;
struct winbindd_domain *domain = NULL;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- char *dom_name_idmap = "";
if (!pw || !dom_name || !user_name)
return False;
nt_status = NT_STATUS_NO_SUCH_DOMAIN;
}
- if (domain->have_idmap_config) {
- dom_name_idmap = dom_name;
- }
-
/* Resolve the uid number */
- if (!NT_STATUS_IS_OK(idmap_sid_to_uid(dom_name_idmap, user_sid,
+ if (!NT_STATUS_IS_OK(idmap_sid_to_uid(domain->have_idmap_config ?
+ dom_name : "", user_sid,
&pw->pw_uid))) {
DEBUG(1, ("error getting user id for sid %s\n",
sid_string_dbg(user_sid)));
/* Resolve the gid number */
- if (!NT_STATUS_IS_OK(idmap_sid_to_gid(dom_name_idmap, group_sid,
+ if (!NT_STATUS_IS_OK(idmap_sid_to_gid(domain->have_idmap_config ?
+ dom_name : "", group_sid,
&pw->pw_gid))) {
DEBUG(1, ("error getting group id for sid %s\n",
sid_string_dbg(group_sid)));