[PATCH] winbind: lookup_usergroups_cached doesn't "domain"
Volker Lendecke
vl at samba.org
Sun Dec 4 12:10:09 UTC 2016
Hi!
Review appreciated!
Thanks, Volker
-------------- next part --------------
>From 645924ed17abfa175d97dd7e16ba1c124e878a12 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 4 Nov 2016 15:33:11 +0100
Subject: [PATCH] winbind: lookup_usergroups_cached doesn't use the "domain"
parameter
Signed-off-by: Volker Lendecke <vl at samba.org>
---
source3/winbindd/wb_lookupusergroups.c | 3 +--
source3/winbindd/winbindd_ads.c | 2 +-
source3/winbindd/winbindd_msrpc.c | 3 +--
source3/winbindd/winbindd_proto.h | 3 +--
source3/winbindd/winbindd_util.c | 3 +--
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index f74a206..2d39692 100644
--- a/source3/winbindd/wb_lookupusergroups.c
+++ b/source3/winbindd/wb_lookupusergroups.c
@@ -46,8 +46,7 @@ struct tevent_req *wb_lookupusergroups_send(TALLOC_CTX *mem_ctx,
}
sid_copy(&state->sid, sid);
- status = lookup_usergroups_cached(NULL,
- state,
+ status = lookup_usergroups_cached(state,
&state->sid,
&state->sids.num_sids,
&state->sids.sids);
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index fdb6806..a4339f1 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -1013,7 +1013,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
DEBUG(3,("ads: lookup_usergroups\n"));
*p_num_groups = 0;
- status = lookup_usergroups_cached(domain, mem_ctx, sid,
+ status = lookup_usergroups_cached(mem_ctx, sid,
p_num_groups, user_sids);
if (NT_STATUS_IS_OK(status)) {
return NT_STATUS_OK;
diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index dff27b4..42ca142 100644
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -505,8 +505,7 @@ static NTSTATUS msrpc_lookup_usergroups(struct winbindd_domain *domain,
}
/* Check if we have a cached user_info_3 */
- status = lookup_usergroups_cached(domain,
- tmp_ctx,
+ status = lookup_usergroups_cached(tmp_ctx,
user_sid,
&num_groups,
&user_grpsids);
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 23900af..675d27f 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -503,8 +503,7 @@ void winbindd_add_client(struct winbindd_cli_state *cli);
void winbindd_remove_client(struct winbindd_cli_state *cli);
void winbindd_promote_client(struct winbindd_cli_state *cli);
int winbindd_num_clients(void);
-NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
- TALLOC_CTX *mem_ctx,
+NTSTATUS lookup_usergroups_cached(TALLOC_CTX *mem_ctx,
const struct dom_sid *user_sid,
uint32_t *p_num_groups, struct dom_sid **user_sids);
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index aabaa6a..a35b59e 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -1275,8 +1275,7 @@ int winbindd_num_clients(void)
return _num_clients;
}
-NTSTATUS lookup_usergroups_cached(struct winbindd_domain *domain,
- TALLOC_CTX *mem_ctx,
+NTSTATUS lookup_usergroups_cached(TALLOC_CTX *mem_ctx,
const struct dom_sid *user_sid,
uint32_t *p_num_groups, struct dom_sid **user_sids)
{
--
2.1.4
More information about the samba-technical
mailing list