summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-10 16:23:20 +0100
committerVolker Lendecke <vlendec@samba.org>2011-03-10 19:33:46 +0100
commit257f0491cbcc6d8a7d05520ccb3ffa7dd7c27273 (patch)
treee5cb3c8b8f09a7350db87fdfdc55d95cd00413b3
parent16b007c2232cc8432fa9e93409e16367d72b149e (diff)
downloadsamba-257f0491cbcc6d8a7d05520ccb3ffa7dd7c27273.tar.gz
samba-257f0491cbcc6d8a7d05520ccb3ffa7dd7c27273.tar.bz2
samba-257f0491cbcc6d8a7d05520ccb3ffa7dd7c27273.zip
s3: sid->domain_sid in winbindd_samr sam_rids_to_names
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu Mar 10 19:33:47 CET 2011 on sn-devel-104
-rw-r--r--source3/winbindd/winbindd_samr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 3a4724632f..40c0bb6bbb 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -751,7 +751,7 @@ done:
static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
- const struct dom_sid *sid,
+ const struct dom_sid *domain_sid,
uint32 *rids,
size_t num_rids,
char **pdomain_name,
@@ -772,13 +772,13 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
ZERO_STRUCT(lsa_policy);
/* Paranoia check */
- if (!sid_check_is_builtin(sid) &&
- !sid_check_is_domain(sid) &&
- !sid_check_is_unix_users(sid) &&
- !sid_check_is_unix_groups(sid) &&
- !sid_check_is_in_wellknown_domain(sid)) {
+ if (!sid_check_is_builtin(domain_sid) &&
+ !sid_check_is_domain(domain_sid) &&
+ !sid_check_is_unix_users(domain_sid) &&
+ !sid_check_is_unix_groups(domain_sid) &&
+ !sid_check_is_in_wellknown_domain(domain_sid)) {
DEBUG(0, ("sam_rids_to_names: possible deadlock - trying to "
- "lookup SID %s\n", sid_string_dbg(sid)));
+ "lookup SID %s\n", sid_string_dbg(domain_sid)));
return NT_STATUS_NONE_MAPPED;
}
@@ -798,7 +798,7 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
lsa_pipe,
&lsa_policy,
domain,
- sid,
+ domain_sid,
rids,
num_rids,
&domain_name,