diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-29 16:40:24 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-05-17 09:18:54 +0200 |
| commit | 0cd25e2fba1a5732842dd3c73dc6e3145a48ad1d (patch) | |
| tree | bf8f6e8f423ecd9a29dbe74d122c8726bcbf5e89 /source3 | |
| parent | d8e2bfd7e86d869a439fd4b271316a7d86c4fb14 (diff) | |
| download | samba-0cd25e2fba1a5732842dd3c73dc6e3145a48ad1d.tar.gz samba-0cd25e2fba1a5732842dd3c73dc6e3145a48ad1d.tar.xz samba-0cd25e2fba1a5732842dd3c73dc6e3145a48ad1d.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
(cherry picked from commit bbacaec4e9365b128eb11467c95412de7473c1ec)
(cherry picked from commit 2cc2f7fe76e501c95206f91f4170d7e3829d89a0)
Diffstat (limited to 'source3')
| -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 860749dc0f1..fb17b9aeeef 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2681,11 +2681,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 889e87e9b5a..0c2789e070d 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 67256a7bc14..42a5433c126 100644 --- a/source3/rpc_server/rpc_ncacn_np.h +++ b/source3/rpc_server/rpc_ncacn_np.h @@ -53,4 +53,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 e3b6e6aa34e..1b8e5e0d85f 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 16a0ee053e9..833147b1a64 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 |