r24937: Merge tests spoolss RPC callbacks.

(This used to be commit 9b256a0ca232ea6e89771bf73a1adf877273a752)

1 files changed, 11 insertions, 86 deletions

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 35b37b3af6..466d35c373 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -39,11 +39,11 @@ extern const struct dcesrv_interface dcesrv_mgmt_interface;
 /*
   see if two endpoints match
 */
-static BOOL endpoints_match(const struct dcerpc_binding *ep1,
+static bool endpoints_match(const struct dcerpc_binding *ep1,
 			    const struct dcerpc_binding *ep2)
 {
 	if (ep1->transport != ep2->transport) {
-		return False;
+		return false;
 	}
 
 	if (!ep1->endpoint || !ep2->endpoint) {
@@ -51,9 +51,9 @@ static BOOL endpoints_match(const struct dcerpc_binding *ep1,
 	}
 
 	if (strcasecmp(ep1->endpoint, ep2->endpoint) != 0) 
-		return False;
+		return false;
 
-	return True;
+	return true;
 }
 
 /*
@@ -1246,7 +1246,7 @@ _PUBLIC_ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
 	return status;
 }
 
-static NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_servers, struct dcesrv_context **_dce_ctx)
+_PUBLIC_ NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_servers, struct dcesrv_context **_dce_ctx)
 {
 	NTSTATUS status;
 	struct dcesrv_context *dce_ctx;
@@ -1282,21 +1282,6 @@ static NTSTATUS dcesrv_init_context(TALLOC_CTX *mem_ctx, const char **endpoint_s
 	return NT_STATUS_OK;
 }
 
-/*
-  initialise the dcerpc server context for ncacn_np based services
-*/
-_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx)
-{
-	NTSTATUS status;
-	struct dcesrv_context *dce_ctx;
-
-	status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(), &dce_ctx);
-	NT_STATUS_NOT_OK_RETURN(status);
-
-	*_dce_ctx = dce_ctx;
-	return NT_STATUS_OK;
-}
-
 /* the list of currently registered DCERPC endpoint servers.
  */
 static struct ep_server {
@@ -1379,78 +1364,18 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
 }
 
 /*
-  open the dcerpc server sockets
+  initialise the dcerpc server context for ncacn_np based services
 */
-static void dcesrv_task_init(struct task_server *task)
+_PUBLIC_ NTSTATUS dcesrv_init_ipc_context(TALLOC_CTX *mem_ctx, struct dcesrv_context **_dce_ctx)
 {
 	NTSTATUS status;
 	struct dcesrv_context *dce_ctx;
-	struct dcesrv_endpoint *e;
 
-	task_server_set_title(task, "task[dcesrv]");
-
-	status = dcesrv_init_context(task->event_ctx,
-				     lp_dcerpc_endpoint_servers(),
-				     &dce_ctx);
-	if (!NT_STATUS_IS_OK(status)) goto failed;
-
-	/* Make sure the directory for NCALRPC exists */
-	if (!directory_exist(lp_ncalrpc_dir())) {
-		mkdir(lp_ncalrpc_dir(), 0755);
-	}
-
-	for (e=dce_ctx->endpoint_list;e;e=e->next) {
-		switch (e->ep_description->transport) {
-		case NCACN_UNIX_STREAM:
-			status = dcesrv_add_ep_unix(dce_ctx, e, task->event_ctx, task->model_ops);
-			if (!NT_STATUS_IS_OK(status)) goto failed;
-			break;
-		
-		case NCALRPC:
-			status = dcesrv_add_ep_ncalrpc(dce_ctx, e, task->event_ctx, task->model_ops);
-			if (!NT_STATUS_IS_OK(status)) goto failed;
-			break;
-
-		case NCACN_IP_TCP:
-			status = dcesrv_add_ep_tcp(dce_ctx, e, task->event_ctx, task->model_ops);
-			if (!NT_STATUS_IS_OK(status)) goto failed;
-			break;
-			
-		case NCACN_NP:
-			status = dcesrv_add_ep_np(dce_ctx, e, task->event_ctx, task->model_ops);
-			if (!NT_STATUS_IS_OK(status)) goto failed;
-			break;
-
-		default:
-			status = NT_STATUS_NOT_SUPPORTED;
-			if (!NT_STATUS_IS_OK(status)) goto failed;
-		}
-	}
-
-	return;
-failed:
-	task_server_terminate(task, "Failed to startup dcerpc server task");	
-}
+	status = dcesrv_init_context(mem_ctx, lp_dcerpc_endpoint_servers(), &dce_ctx);
+	NT_STATUS_NOT_OK_RETURN(status);
 
-/*
-  called on startup of the smb server service It's job is to start
-  listening on all configured sockets
-*/
-static NTSTATUS dcesrv_init(struct event_context *event_context, 
-			    const struct model_ops *model_ops)
-{	
-	return task_server_startup(event_context, model_ops, dcesrv_task_init);
+	*_dce_ctx = dce_ctx;
+	return NT_STATUS_OK;
 }
 
-NTSTATUS server_service_rpc_init(void)
-{
-	init_module_fn static_init[] = STATIC_dcerpc_server_MODULES;
-	init_module_fn *shared_init = load_samba_modules(NULL, "dcerpc_server");
-
-	run_init_functions(static_init);
-	run_init_functions(shared_init);
 
-	talloc_free(shared_init);
-	
-	return register_server_service("rpc", dcesrv_init);
-}