summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-02 13:27:45 +0200
committerGünther Deschner <gd@samba.org>2011-05-02 16:05:31 +0200
commit56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2 (patch)
tree3ce94c576184253d8049cabe5f4bd1738bea99dd
parent1a561dedb9995f52411d2fed2c6e0cc1e37a85d1 (diff)
downloadsamba-56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2.tar.gz
samba-56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2.tar.bz2
samba-56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2.zip
s3-rpc_server: (re)move last globally included rpc_server prototypes.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Mon May 2 16:05:31 CEST 2011 on sn-devel-104
-rw-r--r--source3/include/proto.h9
-rw-r--r--source3/rpc_server/rpc_server.c1
-rw-r--r--source3/rpc_server/srv_pipe.c1
-rw-r--r--source3/rpc_server/srv_pipe.h33
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c1
5 files changed, 36 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a3f9efcf31..ebfa5e633a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2621,15 +2621,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/srv_pipe.c */
-struct ncacn_packet;
-struct api_struct;
-struct pipes_struct;
-bool create_next_pdu(struct pipes_struct *p);
-bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt);
-bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS status);
-bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
-
/* The following definitions come from lib/server_contexts.c */
struct tevent_context *server_event_context(void);
void server_event_context_free(void);
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 85b17ea3ca..cdde40c2df 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -29,6 +29,7 @@
#include "auth.h"
#include "rpc_server/rpc_ncacn_np.h"
#include "rpc_server/srv_pipe_hnd.h"
+#include "rpc_server/srv_pipe.h"
#define SERVER_TCP_LOW_PORT 1024
#define SERVER_TCP_HIGH_PORT 1300
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 256540965c..72c8f80959 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -41,6 +41,7 @@
#include "smbd/smbd.h"
#include "auth.h"
#include "ntdomain.h"
+#include "rpc_server/srv_pipe.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_pipe.h b/source3/rpc_server/srv_pipe.h
new file mode 100644
index 0000000000..453cca18d9
--- /dev/null
+++ b/source3/rpc_server/srv_pipe.h
@@ -0,0 +1,33 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * RPC Pipe client / server routines
+ * Almost completely rewritten by (C) Jeremy Allison 2005 - 2010
+ *
+ * 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/>.
+ */
+
+#ifndef _RPC_SERVER_SRV_PIPE_H_
+#define _RPC_SERVER_SRV_PIPE_H_
+
+struct ncacn_packet;
+struct pipes_struct;
+
+/* The following definitions come from rpc_server/srv_pipe.c */
+
+bool create_next_pdu(struct pipes_struct *p);
+bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt);
+bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS status);
+bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
+
+#endif /* _RPC_SERVER_SRV_PIPE_H_ */
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index fa296606a9..0c128a0ac5 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -26,6 +26,7 @@
#include "ntdomain.h"
#include "rpc_server/rpc_ncacn_np.h"
#include "rpc_server/srv_pipe_hnd.h"
+#include "rpc_server/srv_pipe.h"
#include "../lib/tsocket/tsocket.h"
#include "../lib/util/tevent_ntstatus.h"