s3-rpc: Create a file with all functions for a internal named pipe.

This makes it possible to use the samr rpc server in winbind without
linking in smbd.

Reviewed-by: Simo Sorce <idra@samba.org>

5 files changed, 256 insertions, 205 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 19bee48ab9..d9e4ec5a6e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -653,7 +653,11 @@ RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
 
 NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o
 
-RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o rpc_server/srv_pipe_register.c
+RPC_NCACN_NP_INTERNAL = rpc_server/srv_pipe_register.o rpc_server/rpc_ncacn_np_internal.o \
+			rpc_server/srv_lsa_hnd.o
+
+RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
+	       $(RPC_NCACN_NP_INTERNAL)
 
 RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 590f3fb733..884ce3f07f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4901,6 +4901,10 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host,
 NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
 			       const struct ndr_syntax_id *abstract_syntax,
 			       struct rpc_pipe_client **presult);
+struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
+					      const struct ndr_syntax_id *syntax,
+					      const char *client_address,
+					      struct auth_serversupplied_info *server_info);
 NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax,
 				NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r),
 				struct auth_serversupplied_info *serversupplied_info,
diff --git a/source3/rpc_server/rpc_ncacn_np_internal.c b/source3/rpc_server/rpc_ncacn_np_internal.c
new file mode 100644
index 0000000000..6002489bd9
--- /dev/null
+++ b/source3/rpc_server/rpc_ncacn_np_internal.c
@@ -0,0 +1,242 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-1998,
+ *  Largely re-written : 2005
+ *  Copyright (C) Jeremy Allison		1998 - 2005
+ *
+ *  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/>.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
+
+static int pipes_open;
+
+static pipes_struct *InternalPipes;
+
+/* TODO
+ * the following prototypes are declared here to avoid
+ * code being moved about too much for a patch to be
+ * disrupted / less obvious.
+ *
+ * these functions, and associated functions that they
+ * call, should be moved behind a .so module-loading
+ * system _anyway_.  so that's the next step...
+ */
+
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
+
+/****************************************************************************
+ Internal Pipe iterator functions.
+****************************************************************************/
+
+pipes_struct *get_first_internal_pipe(void)
+{
+	return InternalPipes;
+}
+
+pipes_struct *get_next_internal_pipe(pipes_struct *p)
+{
+	return p->next;
+}
+
+static void free_pipe_rpc_context_internal( PIPE_RPC_FNS *list )
+{
+	PIPE_RPC_FNS *tmp = list;
+	PIPE_RPC_FNS *tmp2;
+
+	while (tmp) {
+		tmp2 = tmp->next;
+		SAFE_FREE(tmp);
+		tmp = tmp2;
+	}
+
+	return;
+}
+
+/****************************************************************************
+ Close an rpc pipe.
+****************************************************************************/
+
+static int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
+{
+	if (!p) {
+		DEBUG(0,("Invalid pipe in close_internal_rpc_pipe_hnd\n"));
+		return False;
+	}
+
+	prs_mem_free(&p->out_data.frag);
+	prs_mem_free(&p->out_data.rdata);
+	prs_mem_free(&p->in_data.data);
+
+	if (p->auth.auth_data_free_func) {
+		(*p->auth.auth_data_free_func)(&p->auth);
+	}
+
+	free_pipe_rpc_context_internal( p->contexts );
+
+	/* Free the handles database. */
+	close_policy_by_pipe(p);
+
+	DLIST_REMOVE(InternalPipes, p);
+
+	ZERO_STRUCTP(p);
+
+	return 0;
+}
+
+/****************************************************************************
+ Make an internal namedpipes structure
+****************************************************************************/
+
+struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
+					      const struct ndr_syntax_id *syntax,
+					      const char *client_address,
+					      struct auth_serversupplied_info *server_info)
+{
+	pipes_struct *p;
+
+	DEBUG(4,("Create pipe requested %s\n",
+		 get_pipe_name_from_syntax(talloc_tos(), syntax)));
+
+	p = TALLOC_ZERO_P(mem_ctx, struct pipes_struct);
+
+	if (!p) {
+		DEBUG(0,("ERROR! no memory for pipes_struct!\n"));
+		return NULL;
+	}
+
+	p->mem_ctx = talloc_named(p, 0, "pipe %s %p",
+				 get_pipe_name_from_syntax(talloc_tos(),
+							   syntax), p);
+	if (p->mem_ctx == NULL) {
+		DEBUG(0,("open_rpc_pipe_p: talloc_init failed.\n"));
+		TALLOC_FREE(p);
+		return NULL;
+	}
+
+	if (!init_pipe_handle_list(p, syntax)) {
+		DEBUG(0,("open_rpc_pipe_p: init_pipe_handles failed.\n"));
+		TALLOC_FREE(p);
+		return NULL;
+	}
+
+	/*
+	 * Initialize the incoming RPC data buffer with one PDU worth of memory.
+	 * We cheat here and say we're marshalling, as we intend to add incoming
+	 * data directly into the prs_struct and we want it to auto grow. We will
+	 * change the type to UNMARSALLING before processing the stream.
+	 */
+
+	if(!prs_init(&p->in_data.data, 128, p->mem_ctx, MARSHALL)) {
+		DEBUG(0,("open_rpc_pipe_p: malloc fail for in_data struct.\n"));
+		close_policy_by_pipe(p);
+		TALLOC_FREE(p);
+		return NULL;
+	}
+
+	p->server_info = copy_serverinfo(p, server_info);
+	if (p->server_info == NULL) {
+		DEBUG(0, ("open_rpc_pipe_p: copy_serverinfo failed\n"));
+		close_policy_by_pipe(p);
+		TALLOC_FREE(p);
+		return NULL;
+	}
+
+	DLIST_ADD(InternalPipes, p);
+
+	memcpy(p->client_address, client_address, sizeof(p->client_address));
+
+	p->endian = RPC_LITTLE_ENDIAN;
+
+	/*
+	 * Initialize the outgoing RPC data buffer with no memory.
+	 */
+	prs_init_empty(&p->out_data.rdata, p->mem_ctx, MARSHALL);
+
+	p->syntax = *syntax;
+
+	DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
+		 get_pipe_name_from_syntax(talloc_tos(), syntax), pipes_open));
+
+	talloc_set_destructor(p, close_internal_rpc_pipe_hnd);
+
+	return p;
+}
+
+/**
+ * @brief Create a new RPC client context which uses a local dispatch function.
+ *
+ * @param[in]  mem_ctx  The memory context to use.
+ *
+ * @param[in]  abstract_syntax Normally the syntax_id of the autogenerated
+ *                             ndr_table_<name>.
+ *
+ * @param[in]  dispatch The corresponding autogenerated dispatch function
+ *                      rpc_<name>_dispatch.
+ *
+ * @param[in]  serversupplied_info The server supplied authentication function.
+ *
+ * @param[out] presult  A pointer to store the connected rpc client pipe.
+ *
+ * @return              NT_STATUS_OK on success, a corresponding NT status if an
+ *                      error occured.
+ *
+ * @code
+ *   struct rpc_pipe_client *winreg_pipe;
+ *   NTSTATUS status;
+ *
+ *   status = rpc_pipe_open_internal(tmp_ctx,
+ *                                   &ndr_table_winreg.syntax_id,
+ *                                   rpc_winreg_dispatch,
+ *                                   p->server_info,
+ *                                   &winreg_pipe);
+ * @endcode
+ */
+NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
+				const struct ndr_syntax_id *abstract_syntax,
+				NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
+						      TALLOC_CTX *mem_ctx,
+						      const struct ndr_interface_table *table,
+						      uint32_t opnum, void *r),
+				struct auth_serversupplied_info *serversupplied_info,
+				struct rpc_pipe_client **presult)
+{
+	struct rpc_pipe_client *result;
+
+	result = TALLOC_ZERO_P(mem_ctx, struct rpc_pipe_client);
+	if (result == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	result->abstract_syntax = *abstract_syntax;
+	result->transfer_syntax = ndr_transfer_syntax;
+	result->dispatch = dispatch;
+
+	result->pipes_struct = make_internal_rpc_pipe_p(
+		result, abstract_syntax, "", serversupplied_info);
+	if (result->pipes_struct == NULL) {
+		TALLOC_FREE(result);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	result->max_xmit_frag = -1;
+	result->max_recv_frag = -1;
+
+	*presult = result;
+	return NT_STATUS_OK;
+}
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index 5ba9477b07..0a8b715b98 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -27,36 +27,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-static int pipes_open;
-
-static pipes_struct *InternalPipes;
-
-/* TODO
- * the following prototypes are declared here to avoid
- * code being moved about too much for a patch to be
- * disrupted / less obvious.
- *
- * these functions, and associated functions that they
- * call, should be moved behind a .so module-loading
- * system _anyway_.  so that's the next step...
- */
-
-static int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
-
-/****************************************************************************
- Internal Pipe iterator functions.
-****************************************************************************/
-
-pipes_struct *get_first_internal_pipe(void)
-{
-	return InternalPipes;
-}
-
-pipes_struct *get_next_internal_pipe(pipes_struct *p)
-{
-	return p->next;
-}
-
 /****************************************************************************
  Initialise an outgoing packet.
 ****************************************************************************/
@@ -87,85 +57,6 @@ static bool pipe_init_outgoing_data(pipes_struct *p)
 }
 
 /****************************************************************************
- Make an internal namedpipes structure
-****************************************************************************/
-
-static struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
-						     const struct ndr_syntax_id *syntax,
-						     const char *client_address,
-						     struct auth_serversupplied_info *server_info)
-{
-	pipes_struct *p;
-
-	DEBUG(4,("Create pipe requested %s\n",
-		 get_pipe_name_from_syntax(talloc_tos(), syntax)));
-
-	p = TALLOC_ZERO_P(mem_ctx, struct pipes_struct);
-
-	if (!p) {
-		DEBUG(0,("ERROR! no memory for pipes_struct!\n"));
-		return NULL;
-	}
-
-	p->mem_ctx = talloc_named(p, 0, "pipe %s %p",
-				 get_pipe_name_from_syntax(talloc_tos(),
-							   syntax), p);
-	if (p->mem_ctx == NULL) {
-		DEBUG(0,("open_rpc_pipe_p: talloc_init failed.\n"));
-		TALLOC_FREE(p);
-		return NULL;
-	}
-
-	if (!init_pipe_handle_list(p, syntax)) {
-		DEBUG(0,("open_rpc_pipe_p: init_pipe_handles failed.\n"));
-		TALLOC_FREE(p);
-		return NULL;
-	}
-
-	/*
-	 * Initialize the incoming RPC data buffer with one PDU worth of memory.
-	 * We cheat here and say we're marshalling, as we intend to add incoming
-	 * data directly into the prs_struct and we want it to auto grow. We will
-	 * change the type to UNMARSALLING before processing the stream.
-	 */
-
-	if(!prs_init(&p->in_data.data, 128, p->mem_ctx, MARSHALL)) {
-		DEBUG(0,("open_rpc_pipe_p: malloc fail for in_data struct.\n"));
-		close_policy_by_pipe(p);
-		TALLOC_FREE(p);
-		return NULL;
-	}
-
-	p->server_info = copy_serverinfo(p, server_info);
-	if (p->server_info == NULL) {
-		DEBUG(0, ("open_rpc_pipe_p: copy_serverinfo failed\n"));
-		close_policy_by_pipe(p);
-		TALLOC_FREE(p);
-		return NULL;
-	}
-
-	DLIST_ADD(InternalPipes, p);
-
-	memcpy(p->client_address, client_address, sizeof(p->client_address));
-
-	p->endian = RPC_LITTLE_ENDIAN;
-
-	/*
-	 * Initialize the outgoing RPC data buffer with no memory.
-	 */	
-	prs_init_empty(&p->out_data.rdata, p->mem_ctx, MARSHALL);
-
-	p->syntax = *syntax;
-
-	DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
-		 get_pipe_name_from_syntax(talloc_tos(), syntax), pipes_open));
-
-	talloc_set_destructor(p, close_internal_rpc_pipe_hnd);
-
-	return p;
-}
-
-/****************************************************************************
  Sets the fault state on incoming packets.
 ****************************************************************************/
 
@@ -911,37 +802,6 @@ static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_
 	return data_returned;
 }
 
-/****************************************************************************
- Close an rpc pipe.
-****************************************************************************/
-
-static int close_internal_rpc_pipe_hnd(struct pipes_struct *p)
-{
-	if (!p) {
-		DEBUG(0,("Invalid pipe in close_internal_rpc_pipe_hnd\n"));
-		return False;
-	}
-
-	prs_mem_free(&p->out_data.frag);
-	prs_mem_free(&p->out_data.rdata);
-	prs_mem_free(&p->in_data.data);
-
-	if (p->auth.auth_data_free_func) {
-		(*p->auth.auth_data_free_func)(&p->auth);
-	}
-
-	free_pipe_rpc_context( p->contexts );
-
-	/* Free the handles database. */
-	close_policy_by_pipe(p);
-
-	DLIST_REMOVE(InternalPipes, p);
-
-	ZERO_STRUCTP(p);
-
-	return 0;
-}
-
 bool fsp_is_np(struct files_struct *fsp)
 {
 	enum FAKE_FILE_TYPE type;
@@ -1454,69 +1314,6 @@ NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
 /**
  * @brief Create a new RPC client context which uses a local dispatch function.
  *
- * @param[in]  mem_ctx  The memory context to use.
- *
- * @param[in]  abstract_syntax Normally the syntax_id of the autogenerated
- *                             ndr_table_<name>.
- *
- * @param[in]  dispatch The corresponding autogenerated dispatch function
- *                      rpc_<name>_dispatch.
- *
- * @param[in]  serversupplied_info The server supplied authentication function.
- *
- * @param[out] presult  A pointer to store the connected rpc client pipe.
- *
- * @return              NT_STATUS_OK on success, a corresponding NT status if an
- *                      error occured.
- *
- * @code
- *   struct rpc_pipe_client *winreg_pipe;
- *   NTSTATUS status;
- *
- *   status = rpc_pipe_open_internal(tmp_ctx,
- *                                   &ndr_table_winreg.syntax_id,
- *                                   rpc_winreg_dispatch,
- *                                   p->server_info,
- *                                   &winreg_pipe);
- * @endcode
- */
-NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
-				const struct ndr_syntax_id *abstract_syntax,
-				NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
-						      TALLOC_CTX *mem_ctx,
-						      const struct ndr_interface_table *table,
-						      uint32_t opnum, void *r),
-				struct auth_serversupplied_info *serversupplied_info,
-				struct rpc_pipe_client **presult)
-{
-	struct rpc_pipe_client *result;
-
-	result = TALLOC_ZERO_P(mem_ctx, struct rpc_pipe_client);
-	if (result == NULL) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	result->abstract_syntax = *abstract_syntax;
-	result->transfer_syntax = ndr_transfer_syntax;
-	result->dispatch = dispatch;
-
-	result->pipes_struct = make_internal_rpc_pipe_p(
-		result, abstract_syntax, "", serversupplied_info);
-	if (result->pipes_struct == NULL) {
-		TALLOC_FREE(result);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	result->max_xmit_frag = -1;
-	result->max_recv_frag = -1;
-
-	*presult = result;
-	return NT_STATUS_OK;
-}
-
-/**
- * @brief Create a new RPC client context which uses a local dispatch function.
- *
  * @param[in]  conn  The connection struct that will hold the pipe
  *
  * @param[out] spoolss_pipe  A pointer to the connected rpc client pipe.
diff --git a/source3/wscript_build b/source3/wscript_build
index 2077661722..983538f29d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -396,7 +396,11 @@ RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
 
 NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
 
-RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c rpc_server/srv_pipe_register.c'''
+RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np_internal.c
+                        rpc_server/srv_lsa_hnd.c'''
+
+RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
+               ${RPC_NCACN_NP_INTERNAL}'''
 
 RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''