summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-29 16:20:27 +0200
committerGünther Deschner <gd@samba.org>2011-04-29 21:01:05 +0200
commitbc781bf7d98baca57c8043bf7dc0a95f8ffd1345 (patch)
tree83e79e446fd4772b717bf33b1c225b94b21d3d32
parent487cb0c96ef8ca05fcef35d0d7c49bc067f6cff7 (diff)
downloadsamba-bc781bf7d98baca57c8043bf7dc0a95f8ffd1345.tar.gz
samba-bc781bf7d98baca57c8043bf7dc0a95f8ffd1345.tar.bz2
samba-bc781bf7d98baca57c8043bf7dc0a95f8ffd1345.zip
s3-proto: remove duplicate prototypes.
Guenther
-rw-r--r--source3/include/proto.h30
-rw-r--r--source3/lib/netapi/netapi_private.h2
-rw-r--r--source3/librpc/rpc/dcerpc_ep.c1
-rw-r--r--source3/rpc_client/cli_winreg_int.h1
-rw-r--r--source3/rpc_server/rpc_ncacn_np.h3
-rw-r--r--source3/smbd/lanman.c1
6 files changed, 9 insertions, 29 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 215fa015c4..948c24de42 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2619,34 +2619,6 @@ void set_server_role(void);
uint32 get_int_param( const char* param );
char* get_string_param( const char* param );
-/* The following definitions come from rpc_server/rpc_ncacn_np.c */
-struct auth_serversupplied_info;
-struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
- const struct ndr_syntax_id *syntax,
- struct client_address *client_id,
- const struct auth_serversupplied_info *session_info,
- struct messaging_context *msg_ctx);
-struct dcerpc_binding_handle;
-struct ndr_interface_table;
-NTSTATUS rpcint_binding_handle(TALLOC_CTX *mem_ctx,
- const struct ndr_interface_table *ndr_table,
- struct client_address *client_id,
- const struct auth_serversupplied_info *session_info,
- struct messaging_context *msg_ctx,
- struct dcerpc_binding_handle **binding_handle);
-NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
- const struct ndr_syntax_id *abstract_syntax,
- const struct auth_serversupplied_info *serversupplied_info,
- struct client_address *client_id,
- struct messaging_context *msg_ctx,
- struct rpc_pipe_client **presult);
-NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
- const struct ndr_syntax_id *syntax,
- const struct auth_serversupplied_info *session_info,
- struct client_address *client_id,
- struct messaging_context *msg_ctx,
- struct rpc_pipe_client **cli_pipe);
-
/* The following definitions come from rpc_server/srv_rpc_register.c */
struct rpc_srv_callbacks {
@@ -2656,6 +2628,8 @@ struct rpc_srv_callbacks {
};
struct api_struct;
+struct ndr_interface_table;
+struct pipes_struct;
NTSTATUS rpc_srv_register(int version, const char *clnt,
const char *srv,
const struct ndr_interface_table *iface,
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index 7559c61564..349287b9e9 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -29,6 +29,8 @@
} \
return fn ## _r(ctx, r);
+struct dcerpc_binding_handle;
+
struct libnetapi_private_ctx {
struct {
const char *domain_name;
diff --git a/source3/librpc/rpc/dcerpc_ep.c b/source3/librpc/rpc/dcerpc_ep.c
index 76f7e91fb0..5ed71857bc 100644
--- a/source3/librpc/rpc/dcerpc_ep.c
+++ b/source3/librpc/rpc/dcerpc_ep.c
@@ -23,6 +23,7 @@
#include "../librpc/gen_ndr/ndr_epmapper_c.h"
#include "rpc_client/cli_pipe.h"
#include "auth.h"
+#include "rpc_server/rpc_ncacn_np.h"
#define EPM_MAX_ANNOTATION_SIZE 64
diff --git a/source3/rpc_client/cli_winreg_int.h b/source3/rpc_client/cli_winreg_int.h
index f175c17f5c..6e9d07f95c 100644
--- a/source3/rpc_client/cli_winreg_int.h
+++ b/source3/rpc_client/cli_winreg_int.h
@@ -23,6 +23,7 @@
#define CLI_WINREG_INT_H
struct auth_serversupplied_info;
+struct dcerpc_binding_handle;
/**
* @brief Connect to the interal winreg server and open the given key.
diff --git a/source3/rpc_server/rpc_ncacn_np.h b/source3/rpc_server/rpc_ncacn_np.h
index 7c8619b46d..bff7c4f048 100644
--- a/source3/rpc_server/rpc_ncacn_np.h
+++ b/source3/rpc_server/rpc_ncacn_np.h
@@ -20,6 +20,8 @@
#ifndef _RPC_NCACN_NP_H_
#define _RPC_NCACN_NP_H_
+struct dcerpc_binding_handle;
+
struct np_proxy_state {
uint16_t file_type;
uint16_t device_state;
@@ -57,5 +59,4 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
struct client_address *client_id,
struct messaging_context *msg_ctx,
struct rpc_pipe_client **cli_pipe);
-
#endif /* _RPC_NCACN_NP_H_ */
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 9885525be5..79737b01b5 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -42,6 +42,7 @@
#include "printing.h"
#include "passdb/machine_sid.h"
#include "auth.h"
+#include "rpc_server/rpc_ncacn_np.h"
#ifdef CHECK_TYPES
#undef CHECK_TYPES