[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri Mar 19 10:06:47 MDT 2010
The branch, master has been updated
via b82f168... s3:librpc: remove unused stuff
from 4d6368f... s3-selftest: enable RAP calls testsuite against samba3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b82f168c3cbd49fdefa9f469ececcbdbce2730a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 10 14:33:58 2010 +0100
s3:librpc: remove unused stuff
metze
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 1 -
source3/include/proto.h | 11 ---
source3/librpc/rpc/dcerpc.c | 187 -------------------------------------------
source3/librpc/rpc/dcerpc.h | 30 -------
4 files changed, 0 insertions(+), 229 deletions(-)
delete mode 100644 source3/librpc/rpc/dcerpc.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4c12157..3d5a618 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -537,7 +537,6 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
rpc_client/cli_spoolss.o \
rpc_client/init_spoolss.o \
rpc_client/init_samr.o \
- librpc/rpc/dcerpc.o \
../librpc/rpc/binding.o
LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ad95863..9200802 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2135,17 +2135,6 @@ _PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
const struct dcerpc_binding *binding,
struct epm_tower *tower);
-/* The following definitions come from librpc/rpc/dcerpc.c */
-
-struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p, const struct GUID *object,
- const struct ndr_interface_table *table, uint32_t opnum,
- TALLOC_CTX *mem_ctx, void *r);
-NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req);
-_PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, struct dcerpc_pipe **pp,
- const char *binding_string, const struct ndr_interface_table *table,
- struct cli_credentials *credentials, struct event_context *ev,
- struct loadparm_context *lp_ctx);
-
/* The following definitions come from libsmb/cliconnect.c */
ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
diff --git a/source3/librpc/rpc/dcerpc.c b/source3/librpc/rpc/dcerpc.c
deleted file mode 100644
index e6c4cb4..0000000
--- a/source3/librpc/rpc/dcerpc.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Samba 4-compatible DCE/RPC API on top of the Samba 3 DCE/RPC client library.
- Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "librpc/rpc/dcerpc.h"
-
-/**
- * Send a struct-based RPC request using the Samba 3 RPC client library.
- */
-struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p, const struct GUID *object,
- const struct ndr_interface_table *table, uint32_t opnum,
- TALLOC_CTX *mem_ctx, void *r)
-{
- const struct ndr_interface_call *call;
- struct ndr_push *push;
- struct rpc_request *ret = talloc(mem_ctx, struct rpc_request);
- enum ndr_err_code ndr_err;
- DATA_BLOB blob;
-
- if (ret == NULL)
- return NULL;
-
- SMB_ASSERT(p->table->num_calls > opnum);
-
- call = &p->table->calls[opnum];
-
- ret->call = call;
- ret->r = r;
-
- push = ndr_push_init_ctx(mem_ctx, NULL);
- if (!push) {
- return NULL;
- }
-
- ndr_err = call->ndr_push(push, NDR_IN, r);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- /* FIXME: ndr_map_error2ntstatus(ndr_err); */
- return NULL;
- }
-
- blob = ndr_push_blob(push);
-
- if (!prs_init_data_blob(&ret->q_ps, &blob, mem_ctx)) {
- return NULL;
- }
-
- talloc_free(push);
-
- ret->opnum = opnum;
-
- ret->pipe = p;
-
- return ret;
-}
-
-#if 0
-
-Completely unfinished and unused -- vl :-)
-
-/**
- * Wait for a DCE/RPC request.
- *
- * @note at the moment this is still sync, even though the API is async.
- */
-NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
-{
- prs_struct r_ps;
- struct ndr_pull *pull;
- NTSTATUS status;
- DATA_BLOB blob;
- enum ndr_err_code ndr_err;
-
- prs_init_empty( &r_ps, req, UNMARSHALL );
-
- status = rpc_api_pipe_req(req, req->pipe->rpc_cli, req->opnum,
- &req->q_ps, &r_ps);
-
- prs_mem_free( &req->q_ps );
-
- if (!NT_STATUS_IS_OK(status)) {
- prs_mem_free( &r_ps );
- return status;
- }
-
- if (!prs_data_blob(&r_ps, &blob, req)) {
- prs_mem_free( &r_ps );
- return NT_STATUS_NO_MEMORY;
- }
-
- prs_mem_free( &r_ps );
-
- pull = ndr_pull_init_blob(&blob, req, NULL);
- if (pull == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- /* have the ndr parser alloc memory for us */
- pull->flags |= LIBNDR_FLAG_REF_ALLOC;
- ndr_err = req->call->ndr_pull(pull, NDR_OUT, req->r);
- talloc_free(pull);
-
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- return ndr_map_error2ntstatus(ndr_err);
- }
-
- return NT_STATUS_OK;
-}
-
-/**
- * Connect to a DCE/RPC interface.
- *
- * @note lp_ctx and ev are ignored at the moment but present
- * for API compatibility.
- */
-_PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, struct dcerpc_pipe **pp,
- const char *binding_string, const struct ndr_interface_table *table,
- struct cli_credentials *credentials, struct event_context *ev,
- struct loadparm_context *lp_ctx)
-{
- struct dcerpc_pipe *p = talloc(parent_ctx, struct dcerpc_pipe);
- struct dcerpc_binding *binding;
- NTSTATUS nt_status;
-
- nt_status = dcerpc_parse_binding(p, binding_string, &binding);
-
- if (NT_STATUS_IS_ERR(nt_status)) {
- DEBUG(1, ("Unable to parse binding string '%s'", binding_string));
- talloc_free(p);
- return nt_status;
- }
-
- if (binding->transport != NCACN_NP) {
- DEBUG(0, ("Only ncacn_np supported"));
- talloc_free(p);
- return NT_STATUS_NOT_SUPPORTED;
- }
-
- /* FIXME: Actually use loadparm_context.. */
-
- /* FIXME: actually use credentials */
-
- nt_status = cli_full_connection(&p->cli, global_myname(), binding->host,
- NULL, 0,
- "IPC$", "IPC",
- get_cmdline_auth_info_username(),
- lp_workgroup(),
- get_cmdline_auth_info_password(),
- get_cmdline_auth_info_use_kerberos() ? CLI_FULL_CONNECTION_USE_KERBEROS : 0,
- get_cmdline_auth_info_signing_state(), NULL);
-
- if (NT_STATUS_IS_ERR(nt_status)) {
- talloc_free(p);
- return nt_status;
- }
-
- nt_status = cli_rpc_pipe_open_noauth(p->cli, &table->syntax_id,
- &p->rpc_cli);
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- talloc_free(p);
- return nt_status;
- }
-
- p->table = table;
-
- *pp = p;
-
- return nt_status;
-}
-
-#endif
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 8da56e2..07e03e9 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -26,40 +26,11 @@
#ifndef __DCERPC_H__
#define __DCERPC_H__
-#include "includes.h"
-#include "librpc/rpc/dcerpc.h"
-#include "librpc/gen_ndr/epmapper.h"
-
-struct loadparm_context;
-struct cli_credentials;
-
-/**
- * Connection to a particular DCE/RPC interface.
- */
-struct dcerpc_pipe {
- const struct ndr_interface_table *table;
-
- /** SMB context used when transport is ncacn_np. */
- struct cli_state *cli;
-
- /** Samba 3 DCE/RPC client context. */
- struct rpc_pipe_client *rpc_cli;
-};
-
-struct rpc_request {
- const struct ndr_interface_call *call;
- prs_struct q_ps;
- uint32_t opnum;
- struct dcerpc_pipe *pipe;
- void *r;
-};
-
enum dcerpc_transport_t {
NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC,
NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM,
NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
-
/** this describes a binding to a particular transport/pipe */
struct dcerpc_binding {
enum dcerpc_transport_t transport;
@@ -122,5 +93,4 @@ struct dcerpc_binding {
/* use NDR64 transport */
#define DCERPC_NDR64 (1<<21)
-
#endif /* __DCERPC_H__ */
--
Samba Shared Repository
More information about the samba-cvs
mailing list