summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-05-17 16:13:26 +0200
committerAndreas Schneider <asn@samba.org>2013-08-05 10:29:59 +0200
commit0ce2178f2ffeaee324c7e8fef7c87727def7bd77 (patch)
tree557d893eaabeb3265568e0ce917844c3ae9252da /source3
parent77f7f2a976e5b95f3bd9f542b92926adee4f5fa6 (diff)
downloadsamba-0ce2178f2ffeaee324c7e8fef7c87727def7bd77.tar.gz
samba-0ce2178f2ffeaee324c7e8fef7c87727def7bd77.tar.bz2
samba-0ce2178f2ffeaee324c7e8fef7c87727def7bd77.zip
s3-libnetapi: pass down ndr_interface_table to pipe_cm() and friends.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/netapi/cm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 310b6d2026..c158792e00 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -161,7 +161,7 @@ WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx)
********************************************************************/
static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
- const struct ndr_syntax_id *interface,
+ const struct ndr_interface_table *table,
struct rpc_pipe_client **presult)
{
struct client_pipe_connection *p;
@@ -177,7 +177,7 @@ static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
if (strequal(ipc_remote_name, p->pipe->desthost)
&& ndr_syntax_id_equal(&p->pipe->abstract_syntax,
- interface)) {
+ &table->syntax_id)) {
*presult = p->pipe;
return NT_STATUS_OK;
}
@@ -191,7 +191,7 @@ static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
struct client_ipc_connection *ipc,
- const struct ndr_syntax_id *interface,
+ const struct ndr_interface_table *table,
struct rpc_pipe_client **presult)
{
struct client_pipe_connection *p;
@@ -202,7 +202,7 @@ static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
- status = cli_rpc_pipe_open_noauth(ipc->cli, interface, &p->pipe);
+ status = cli_rpc_pipe_open_noauth(ipc->cli, &table->syntax_id, &p->pipe);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(p);
return status;
@@ -219,14 +219,14 @@ static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
struct client_ipc_connection *ipc,
- const struct ndr_syntax_id *interface,
+ const struct ndr_interface_table *table,
struct rpc_pipe_client **presult)
{
- if (NT_STATUS_IS_OK(pipe_cm_find(ipc, interface, presult))) {
+ if (NT_STATUS_IS_OK(pipe_cm_find(ipc, table, presult))) {
return NT_STATUS_OK;
}
- return pipe_cm_connect(ctx, ipc, interface, presult);
+ return pipe_cm_connect(ctx, ipc, table, presult);
}
/********************************************************************
@@ -251,7 +251,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
return werr;
}
- status = pipe_cm_open(ctx, ipc, &table->syntax_id, &result);
+ status = pipe_cm_open(ctx, ipc, table, &result);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",
get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id),