From: Samuel Cabrero <scabrero@suse.de>
Date: Mon, 18 Feb 2019 17:25:48 +0000 (+0100)
Subject: s3:rpc_server: Move dcerpc_ncanc_conn to header file
X-Git-Tag: talloc-2.3.0~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc6342e7a5e955c55319021ec3cd2ed5800c40f6;p=thirdparty%2Fsamba.git

s3:rpc_server: Move dcerpc_ncanc_conn to header file

Next commits will remove named_pipe_client and dcerpc_ncacn_connection
will be used in its place. It has to be moved to a header file as it
will be used by functions in rpc_server.c and rpc_ncacn_np.c.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 84d48352be8..625669c294f 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -967,30 +967,6 @@ static void dcesrv_ncalrpc_listener(struct tevent_context *ev,
 			    state->disconnect_fn);
 }
 
-struct dcerpc_ncacn_conn {
-	enum dcerpc_transport_t transport;
-
-	int sock;
-
-	struct pipes_struct *p;
-	dcerpc_ncacn_disconnect_fn disconnect_fn;
-
-	struct tevent_context *ev_ctx;
-	struct messaging_context *msg_ctx;
-
-	struct tstream_context *tstream;
-	struct tevent_queue *send_queue;
-
-	struct tsocket_address *remote_client_addr;
-	char *remote_client_name;
-	struct tsocket_address *local_server_addr;
-	char *local_server_name;
-	struct auth_session_info *session_info;
-
-	struct iovec *iov;
-	size_t count;
-};
-
 static int dcerpc_ncacn_conn_destructor(struct dcerpc_ncacn_conn *ncacn_conn)
 {
 	if (ncacn_conn->disconnect_fn != NULL) {
diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 8c043bc4ba5..2b2bd253629 100644
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -23,10 +23,35 @@
 #include "librpc/rpc/rpc_common.h" /* For enum dcerpc_transport_t */
 
 struct pipes_struct;
+struct auth_session_info;
 
 typedef bool (*dcerpc_ncacn_disconnect_fn)(struct pipes_struct *p);
 typedef void (*named_pipe_termination_fn)(void *private_data);
 
+struct dcerpc_ncacn_conn {
+	enum dcerpc_transport_t transport;
+
+	int sock;
+
+	struct pipes_struct *p;
+	dcerpc_ncacn_disconnect_fn disconnect_fn;
+
+	struct tevent_context *ev_ctx;
+	struct messaging_context *msg_ctx;
+
+	struct tstream_context *tstream;
+	struct tevent_queue *send_queue;
+
+	struct tsocket_address *remote_client_addr;
+	char *remote_client_name;
+	struct tsocket_address *local_server_addr;
+	char *local_server_name;
+	struct auth_session_info *session_info;
+
+	struct iovec *iov;
+	size_t count;
+};
+
 struct named_pipe_client {
 	const char *pipe_name;