From 745f63fd1ead248d5a7cd257c0cb38af3ed9dd8b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Aug 2010 14:46:24 +0200 Subject: s3:rpc_client: remove unused cli_do_rpc_ndr* functions metze --- source3/Makefile.in | 5 +- source3/rpc_client/cli_pipe.c | 9 --- source3/rpc_client/ndr.c | 174 ------------------------------------------ 3 files changed, 1 insertion(+), 187 deletions(-) delete mode 100644 source3/rpc_client/ndr.c (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 1a51b7c471..fac4e0be5e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -316,8 +316,6 @@ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \ librpc/ndr/util.o \ librpc/gen_ndr/ndr_dcerpc.o -RPCCLIENT_NDR_OBJ = rpc_client/ndr.o - LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \ librpc/gen_ndr/ndr_lsa.o @@ -595,8 +593,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \ ../librpc/rpc/dcerpc_util.o \ ../librpc/rpc/binding_handle.o \ librpc/rpc/dcerpc_helpers.o \ - $(LIBNDR_GEN_OBJ) \ - $(RPCCLIENT_NDR_OBJ) + $(LIBNDR_GEN_OBJ) # # registry-related objects diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 6bfcad68e3..840148b17c 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2447,9 +2447,6 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host, result->abstract_syntax = *abstract_syntax; result->transfer_syntax = ndr_transfer_syntax; - result->dispatch = cli_do_rpc_ndr; - result->dispatch_send = cli_do_rpc_ndr_send; - result->dispatch_recv = cli_do_rpc_ndr_recv; result->desthost = talloc_strdup(result, host); result->srv_name_slash = talloc_asprintf_strupper_m( @@ -2664,9 +2661,6 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path, result->abstract_syntax = *abstract_syntax; result->transfer_syntax = ndr_transfer_syntax; - result->dispatch = cli_do_rpc_ndr; - result->dispatch_send = cli_do_rpc_ndr_send; - result->dispatch_recv = cli_do_rpc_ndr_recv; result->desthost = get_myname(result); result->srv_name_slash = talloc_asprintf_strupper_m( @@ -2763,9 +2757,6 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli, result->abstract_syntax = *abstract_syntax; result->transfer_syntax = ndr_transfer_syntax; - result->dispatch = cli_do_rpc_ndr; - result->dispatch_send = cli_do_rpc_ndr_send; - result->dispatch_recv = cli_do_rpc_ndr_recv; result->desthost = talloc_strdup(result, cli->desthost); result->srv_name_slash = talloc_asprintf_strupper_m( result, "\\\\%s", result->desthost); diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c deleted file mode 100644 index a1642c03ff..0000000000 --- a/source3/rpc_client/ndr.c +++ /dev/null @@ -1,174 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - libndr interface - - Copyright (C) Jelmer Vernooij 2006 - Copyright (C) Volker Lendecke 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" - -struct cli_do_rpc_ndr_state { - const struct ndr_interface_call *call; - DATA_BLOB q_pdu; - DATA_BLOB r_pdu; - void *r; -}; - -static void cli_do_rpc_ndr_done(struct tevent_req *subreq); - -struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct rpc_pipe_client *cli, - const struct ndr_interface_table *table, - uint32_t opnum, - void *r) -{ - struct tevent_req *req, *subreq; - struct cli_do_rpc_ndr_state *state; - struct ndr_push *push; - enum ndr_err_code ndr_err; - - req = tevent_req_create(mem_ctx, &state, - struct cli_do_rpc_ndr_state); - if (req == NULL) { - return NULL; - } - - if (!ndr_syntax_id_equal(&table->syntax_id, &cli->abstract_syntax) - || (opnum >= table->num_calls)) { - tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); - return tevent_req_post(req, ev); - } - - state->r = r; - state->call = &table->calls[opnum]; - - if (DEBUGLEVEL >= 10) { - ndr_print_function_debug(state->call->ndr_print, - state->call->name, NDR_IN, r); - } - - push = ndr_push_init_ctx(state); - if (tevent_req_nomem(push, req)) { - return tevent_req_post(req, ev); - } - - ndr_err = state->call->ndr_push(push, NDR_IN, r); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - tevent_req_nterror(req, ndr_map_error2ntstatus(ndr_err)); - TALLOC_FREE(push); - return tevent_req_post(req, ev); - } - - state->q_pdu = ndr_push_blob(push); - talloc_steal(mem_ctx, state->q_pdu.data); - TALLOC_FREE(push); - - subreq = rpc_api_pipe_req_send(state, ev, cli, opnum, &state->q_pdu); - if (tevent_req_nomem(subreq, req)) { - return tevent_req_post(req, ev); - } - tevent_req_set_callback(subreq, cli_do_rpc_ndr_done, req); - return req; -} - -static void cli_do_rpc_ndr_done(struct tevent_req *subreq) -{ - struct tevent_req *req = tevent_req_callback_data( - subreq, struct tevent_req); - struct cli_do_rpc_ndr_state *state = tevent_req_data( - req, struct cli_do_rpc_ndr_state); - NTSTATUS status; - - status = rpc_api_pipe_req_recv(subreq, state, &state->r_pdu); - TALLOC_FREE(subreq); - if (!NT_STATUS_IS_OK(status)) { - tevent_req_nterror(req, status); - return; - } - tevent_req_done(req); -} - -NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx) -{ - struct cli_do_rpc_ndr_state *state = tevent_req_data( - req, struct cli_do_rpc_ndr_state); - struct ndr_pull *pull; - enum ndr_err_code ndr_err; - NTSTATUS status; - - if (tevent_req_is_nterror(req, &status)) { - return status; - } - - pull = ndr_pull_init_blob(&state->r_pdu, mem_ctx); - if (pull == NULL) { - return NT_STATUS_NO_MEMORY; - } - - /* have the ndr parser alloc memory for us */ - pull->flags |= LIBNDR_FLAG_REF_ALLOC; - ndr_err = state->call->ndr_pull(pull, NDR_OUT, state->r); - TALLOC_FREE(pull); - - if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - if (DEBUGLEVEL >= 10) { - ndr_print_function_debug(state->call->ndr_print, - state->call->name, NDR_OUT, - state->r); - } - } else { - return ndr_map_error2ntstatus(ndr_err); - } - - return NT_STATUS_OK; -} - -NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const struct ndr_interface_table *table, - uint32_t opnum, void *r) -{ - TALLOC_CTX *frame = talloc_stackframe(); - struct event_context *ev; - struct tevent_req *req; - NTSTATUS status = NT_STATUS_OK; - - ev = event_context_init(frame); - if (ev == NULL) { - status = NT_STATUS_NO_MEMORY; - goto fail; - } - - req = cli_do_rpc_ndr_send(frame, ev, cli, table, opnum, r); - if (req == NULL) { - status = NT_STATUS_NO_MEMORY; - goto fail; - } - - if (!tevent_req_poll(req, ev)) { - status = map_nt_error_from_unix(errno); - goto fail; - } - - status = cli_do_rpc_ndr_recv(req, mem_ctx); - - fail: - TALLOC_FREE(frame); - return status; -} -- cgit