diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-11-05 09:34:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:47 -0500 |
| commit | 6b6a739eca1e16c0c101289b1984a639fce10223 (patch) | |
| tree | eb3e8b8e54449535e1d713c79f90e08d0850f0a9 /source4/winbind/wb_connect_sam.c | |
| parent | 687dea8de634d6d0e1e4ee9a0550f258cd63a014 (diff) | |
| download | samba-6b6a739eca1e16c0c101289b1984a639fce10223.tar.gz samba-6b6a739eca1e16c0c101289b1984a639fce10223.tar.bz2 samba-6b6a739eca1e16c0c101289b1984a639fce10223.zip | |
r11517: Cleanup time, this looks larger than it is. This mainly gets rid of
wb_domain_request, now that we have queued rpc requests.
Volker
(This used to be commit 848522d1b64c1c283ac1ea7ce7f1a7a1b014a2aa)
Diffstat (limited to 'source4/winbind/wb_connect_sam.c')
| -rw-r--r-- | source4/winbind/wb_connect_sam.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c index 8693356c7a..2ce189a5c7 100644 --- a/source4/winbind/wb_connect_sam.c +++ b/source4/winbind/wb_connect_sam.c @@ -49,7 +49,8 @@ static void connect_samr_recv_pipe(struct composite_context *ctx); static void connect_samr_recv_conn(struct rpc_request *req); static void connect_samr_recv_open(struct rpc_request *req); -struct composite_context *wb_connect_sam_send(struct smbcli_tree *tree, +struct composite_context *wb_connect_sam_send(TALLOC_CTX *mem_ctx, + struct smbcli_tree *tree, uint8_t auth_type, struct cli_credentials *creds, const struct dom_sid *domain_sid) @@ -57,7 +58,7 @@ struct composite_context *wb_connect_sam_send(struct smbcli_tree *tree, struct composite_context *result, *ctx; struct connect_samr_state *state; - result = talloc(NULL, struct composite_context); + result = talloc(mem_ctx, struct composite_context); if (result == NULL) goto failed; result->state = COMPOSITE_STATE_IN_PROGRESS; result->async.fn = NULL; @@ -194,17 +195,18 @@ NTSTATUS wb_connect_sam_recv(struct composite_context *c, return status; } -NTSTATUS wb_connect_sam(struct smbcli_tree *tree, +NTSTATUS wb_connect_sam(TALLOC_CTX *mem_ctx, + struct smbcli_tree *tree, uint8_t auth_type, struct cli_credentials *creds, const struct dom_sid *domain_sid, - TALLOC_CTX *mem_ctx, struct dcerpc_pipe **samr_pipe, struct policy_handle **connect_handle, struct policy_handle **domain_handle) { struct composite_context *c = - wb_connect_sam_send(tree, auth_type, creds, domain_sid); + wb_connect_sam_send(mem_ctx, tree, auth_type, creds, + domain_sid); return wb_connect_sam_recv(c, mem_ctx, samr_pipe, connect_handle, domain_handle); } |