diff options
Diffstat (limited to 'source4/lib/com')
| -rw-r--r-- | source4/lib/com/com.h | 1 | ||||
| -rw-r--r-- | source4/lib/com/dcom/main.c | 14 | ||||
| -rw-r--r-- | source4/lib/com/main.c | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h index 97841e14c3..0a26a568b0 100644 --- a/source4/lib/com/com.h +++ b/source4/lib/com/com.h @@ -26,6 +26,7 @@ struct IUnknown_vtable; struct com_context { struct dcom_client_context *dcom; + struct event_context *event_ctx; }; typedef struct IUnknown *(*get_class_object_function) (const struct GUID *clsid); diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c index 08a928cda6..bc47cb7c68 100644 --- a/source4/lib/com/dcom/main.c +++ b/source4/lib/com/dcom/main.c @@ -84,7 +84,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe ** return dcerpc_pipe_connect(ctx, p, "ncalrpc", DCERPC_IREMOTEACTIVATION_UUID, DCERPC_IREMOTEACTIVATION_VERSION, - ctx->dcom->credentials); + ctx->dcom->credentials, ctx->event_ctx); } /* Allow server name to contain a binding string */ @@ -92,7 +92,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe ** status = dcerpc_pipe_connect_b(ctx, p, bd, DCERPC_IREMOTEACTIVATION_UUID, DCERPC_IREMOTEACTIVATION_VERSION, - ctx->dcom->credentials); + ctx->dcom->credentials, ctx->event_ctx); talloc_free(mem_ctx); return status; @@ -109,7 +109,7 @@ static NTSTATUS dcom_connect_host(struct com_context *ctx, struct dcerpc_pipe ** status = dcerpc_pipe_connect(ctx, p, binding, DCERPC_IREMOTEACTIVATION_UUID, DCERPC_IREMOTEACTIVATION_VERSION, - ctx->dcom->credentials); + ctx->dcom->credentials, ctx->event_ctx); if (NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); @@ -256,7 +256,7 @@ WERROR dcom_get_class_object(struct com_context *ctx, struct GUID *clsid, const return WERR_OK; } -NTSTATUS dcom_get_pipe (struct IUnknown *iface, struct dcerpc_pipe **pp) +NTSTATUS dcom_get_pipe(struct IUnknown *iface, struct dcerpc_pipe **pp) { struct dcerpc_binding *binding; struct GUID iid; @@ -301,9 +301,13 @@ NTSTATUS dcom_get_pipe (struct IUnknown *iface, struct dcerpc_pipe **pp) if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Error parsing string binding")); } else { + /* TODO: jelmer, please look at this. The + "NULL" here should be a real event + context */ status = dcerpc_pipe_connect_b(NULL, &p, binding, uuid, 0.0, - iface->ctx->dcom->credentials); + iface->ctx->dcom->credentials, + NULL); } talloc_free(binding); i++; diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c index 378c3738b9..210e8ba79c 100644 --- a/source4/lib/com/main.c +++ b/source4/lib/com/main.c @@ -21,11 +21,16 @@ #include "includes.h" #include "dlinklist.h" #include "lib/com/com.h" +#include "lib/events/events.h" #include "librpc/gen_ndr/com_dcom.h" -WERROR com_init(struct com_context **ctx) +WERROR com_init(struct com_context **ctx, struct event_context *event_ctx) { *ctx = talloc(NULL, struct com_context); + if (event_ctx == NULL) { + event_ctx = event_context_init(*ctx); + } + (*ctx)->event_ctx = event_ctx; return WERR_OK; } |