From 6a650d7d161e4c4a7bd61bb374f473ba16fbba95 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Nov 2009 19:37:13 +0100 Subject: Revert "s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table" This reverts commit 5fc9d93408effe75abcd231c45cbc14656692ebe. --- source3/lib/netapi/cm.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 813827d4dd..9baba7b824 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -179,11 +179,10 @@ static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx, WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, const char *server_name, - const char *interface, uint32_t interface_version, + const struct ndr_syntax_id *interface, struct rpc_pipe_client **presult) { struct rpc_pipe_client *result = NULL; - struct ndr_syntax_id syntax; NTSTATUS status; WERROR werr; struct cli_state *cli = NULL; @@ -192,19 +191,15 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, return WERR_INVALID_PARAM; } - if (!ndr_syntax_from_string(interface, interface_version, &syntax)) { - return WERR_INVALID_PARAM; - } - werr = libnetapi_open_ipc_connection(ctx, server_name, &cli); if (!W_ERROR_IS_OK(werr)) { return werr; } - status = pipe_cm_open(ctx, cli, &syntax, &result); + status = pipe_cm_open(ctx, cli, interface, &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(), &syntax), + get_pipe_name_from_syntax(talloc_tos(), interface), get_friendly_nt_error_msg(status)); return WERR_DEST_NOT_FOUND; } -- cgit