s3-proto: move more headers to rpc_server/rpc_ncacn_np.h where they origin from.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Apr 29 22:05:07 CEST 2011 on sn-devel-104

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 948c24de42af7ddd1553a7b4379ed32f49f37b0c..170b9ad5e6a6f9cfbb66d69b102ed8e74591eba4 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2651,11 +2651,6 @@ bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
 
 /* The following definitions come from rpc_server/srv_pipe_hnd.c  */
 
-struct pipes_struct *get_first_internal_pipe(void);
-struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p);
-bool check_open_pipes(void);
-int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
-
 bool fsp_is_np(struct files_struct *fsp);
 struct tsocket_address;
 NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,

diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index 889e87e9b5a97adfbed6f3b8066bb1f698600dd1..0c2789e070d9fa8dd5e3236f17a98c412b92c2b1 100644 (file)
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -24,6 +24,7 @@
 #include "../librpc/gen_ndr/ndr_samr.h"
 #include "auth.h"
 #include "ntdomain.h"
+#include "rpc_server/rpc_ncacn_np.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/rpc_ncacn_np.h b/source3/rpc_server/rpc_ncacn_np.h
index bff7c4f0489cc10e0e8db323f60945a2de684ee2..75a9f4008786d9e229e3a2dbdb9ce21bd65f6240 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.h
+++ b/source3/rpc_server/rpc_ncacn_np.h
@@ -59,4 +59,10 @@ 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);
+
+struct pipes_struct *get_first_internal_pipe(void);
+struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p);
+bool check_open_pipes(void);
+int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
+
 #endif /* _RPC_NCACN_NP_H_ */

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index c7c77f037570e71d5942fe543fb16ca8f21a548f..17cbf6d35ad80c2da38fe9e40b15ad750a30234c 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -27,6 +27,7 @@
 #include "../auth/auth_sam_reply.h"
 #include "auth.h"
 #include "ntdomain.h"
+#include "rpc_server/rpc_ncacn_np.h"
 
 #define SERVER_TCP_LOW_PORT  1024
 #define SERVER_TCP_HIGH_PORT 1300

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 16a0ee053e90807974d35fabc4c2965f60513356..833147b1a645d76d584259b62278b77f8a4d94a1 100644 (file)
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "rpc_server/rpc_ncacn_np.h"
 
 /* The connections bitmap is expanded in increments of BITMAP_BLOCK_SZ. The
  * maximum size of the bitmap is the largest positive integer, but you will hit