diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-14 11:55:19 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-01-16 16:22:52 +0100 |
| commit | 59bc7cb0df59c0030ff404e845b3fda048c6ef73 (patch) | |
| tree | 762e52502cdc1472f17ec87626e0fc1764c1d330 /source4/winbind | |
| parent | 00d616e104b4828a157492fa0c8c09b981bcdfb9 (diff) | |
| download | samba-59bc7cb0df59c0030ff404e845b3fda048c6ef73.tar.gz | |
s4:winbind: make clear that we use the global tevent_context
We should avoid using the tevent_context pointer on a
dcecli_connection, it's the same as the global per task one
anyway.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source4/winbind')
| -rw-r--r-- | source4/winbind/wb_connect_lsa.c | 3 | ||||
| -rw-r--r-- | source4/winbind/wb_connect_sam.c | 3 | ||||
| -rw-r--r-- | source4/winbind/wb_init_domain.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_server.h | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/source4/winbind/wb_connect_lsa.c b/source4/winbind/wb_connect_lsa.c index 01bd23bd784..3bf02a0ed09 100644 --- a/source4/winbind/wb_connect_lsa.c +++ b/source4/winbind/wb_connect_lsa.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_lsa_c.h" #include "winbind/wb_server.h" +#include "smbd/service_task.h" /* Helper to initialize LSA with a specific auth methods. Verify by opening * the LSA policy. */ @@ -51,7 +52,7 @@ struct composite_context *wb_init_lsa_send(TALLOC_CTX *mem_ctx, struct composite_context *result, *ctx; struct init_lsa_state *state; - result = composite_create(mem_ctx, domain->netlogon_pipe->conn->event_ctx); + result = composite_create(mem_ctx, domain->service->task->event_ctx); if (result == NULL) goto failed; state = talloc(result, struct init_lsa_state); diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c index 06937b2dee3..67d4983754e 100644 --- a/source4/winbind/wb_connect_sam.c +++ b/source4/winbind/wb_connect_sam.c @@ -26,6 +26,7 @@ #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_samr_c.h" #include "winbind/wb_server.h" +#include "smbd/service_task.h" /* Helper to initialize SAMR with a specific auth methods. Verify by opening @@ -53,7 +54,7 @@ struct composite_context *wb_connect_samr_send(TALLOC_CTX *mem_ctx, struct composite_context *result, *ctx; struct connect_samr_state *state; - result = composite_create(mem_ctx, domain->netlogon_pipe->conn->event_ctx); + result = composite_create(mem_ctx, domain->service->task->event_ctx); if (result == NULL) goto failed; state = talloc(result, struct connect_samr_state); diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 0dda85ca4f8..72a39eb83e3 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -136,6 +136,8 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, state->domain = talloc(state, struct wbsrv_domain); if (state->domain == NULL) goto failed; + state->domain->service = service; + state->domain->info = talloc_reference(state->domain, dom_info); if (state->domain->info == NULL) goto failed; diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index 26c404d12bd..ea93de60c83 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -56,6 +56,8 @@ struct wb_dom_info { struct wbsrv_domain { struct wbsrv_domain *next, *prev; + struct wbsrv_service *service; + struct wb_dom_info *info; /* Details for the server we are currently talking to */ |