winbind: lookup_usergroups_cached doesn't use the "domain" parameter

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index f74a20693b516e13d9c490ce988f4cb7a2dbb93f..2d3969236faf3900a0e0643fe4b09049707be1d9 100644 (file)
--- 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 fdb6806040eb9d952c02f59f9f7827386e46602b..a4339f1a4ef9277497a0b10504794322cb83d272 100644 (file)
--- 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 dff27b49f636936d2ba7c6c0e4d346ec79b4d172..42ca142360a9035e74d46f05147609ab8cb7650c 100644 (file)
--- 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 23900af11482b75143803782c1bf0814e4080c53..675d27f60b29b4dbe7ef1b523d353f529db1639b 100644 (file)
--- 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 aabaa6ac259fa1a153500d2484471c514208f2b2..a35b59e5fb8bad446606798b0508ffd560a95ed6 100644 (file)
--- 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)
 {