diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-29 16:40:24 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-29 22:05:07 +0200 |
| commit | bbacaec4e9365b128eb11467c95412de7473c1ec (patch) | |
| tree | e46e17fd90b60ef6f54d45a43741e1cf065edb8c | |
| parent | bc781bf7d98baca57c8043bf7dc0a95f8ffd1345 (diff) | |
| download | samba-bbacaec4e9365b128eb11467c95412de7473c1ec.tar.gz samba-bbacaec4e9365b128eb11467c95412de7473c1ec.tar.bz2 samba-bbacaec4e9365b128eb11467c95412de7473c1ec.zip | |
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
| -rw-r--r-- | source3/include/proto.h | 5 | ||||
| -rw-r--r-- | source3/rpc_server/rpc_handles.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/rpc_ncacn_np.h | 6 | ||||
| -rw-r--r-- | source3/rpc_server/rpc_server.c | 1 | ||||
| -rw-r--r-- | source3/smbd/conn.c | 1 |
5 files changed, 9 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 948c24de42..170b9ad5e6 100644 --- 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 889e87e9b5..0c2789e070 100644 --- 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 bff7c4f048..75a9f40087 100644 --- 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 c7c77f0375..17cbf6d35a 100644 --- 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 16a0ee053e..833147b1a6 100644 --- 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 |