From: Volker Lendecke <vl@samba.org>
Date: Sat, 16 Jan 2021 20:22:06 +0000 (+0100)
Subject: rpc_server: Pass dcerpc_binding to dcesrv_create_ncacn_np_socket()
X-Git-Tag: tevent-0.11.0~1987
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c889f4475efac2038f0c2ed7fe6c6dedb32b912;p=thirdparty%2Fsamba.git

rpc_server: Pass dcerpc_binding to dcesrv_create_ncacn_np_socket()

It does not need a dcesrv_endpoint.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 0e3e0e14e95..9820be3216f 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -52,7 +52,7 @@ struct dcerpc_ncacn_listen_state {
 	void *termination_data;
 };
 
-NTSTATUS dcesrv_create_ncacn_np_socket(struct dcesrv_endpoint *e, int *out_fd)
+NTSTATUS dcesrv_create_ncacn_np_socket(struct dcerpc_binding *b, int *out_fd)
 {
 	char *np_dir = NULL;
 	int fd = -1;
@@ -61,8 +61,7 @@ NTSTATUS dcesrv_create_ncacn_np_socket(struct dcesrv_endpoint *e, int *out_fd)
 	char *endpoint_normalized = NULL;
 	char *p = NULL;
 
-	endpoint = dcerpc_binding_get_string_option(e->ep_description,
-						    "endpoint");
+	endpoint = dcerpc_binding_get_string_option(b, "endpoint");
 	if (endpoint == NULL) {
 		DBG_ERR("Endpoint mandatory for named pipes\n");
 		return NT_STATUS_INVALID_PARAMETER;
diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index 563fb6bf3f2..4365b0460c4 100644
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -67,7 +67,7 @@ NTSTATUS dcerpc_ncacn_conn_init(TALLOC_CTX *mem_ctx,
 
 void set_incoming_fault(struct pipes_struct *p);
 void process_complete_pdu(struct pipes_struct *p, struct ncacn_packet *pkt);
-NTSTATUS dcesrv_create_ncacn_np_socket(struct dcesrv_endpoint *e, int *out_fd);
+NTSTATUS dcesrv_create_ncacn_np_socket(struct dcerpc_binding *b, int *out_fd);
 
 NTSTATUS dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss,
 					   uint16_t *port,
diff --git a/source3/rpc_server/rpc_service_setup.c b/source3/rpc_server/rpc_service_setup.c
index 3fd4eeb96c8..edf857bae28 100644
--- a/source3/rpc_server/rpc_service_setup.c
+++ b/source3/rpc_server/rpc_service_setup.c
@@ -126,7 +126,7 @@ NTSTATUS dcesrv_create_endpoint_sockets(struct tevent_context *ev_ctx,
 	}
 
 	case NCACN_NP:
-		status = dcesrv_create_ncacn_np_socket(e, fds);
+		status = dcesrv_create_ncacn_np_socket(e->ep_description, fds);
 		break;
 
 	default:
@@ -278,7 +278,8 @@ NTSTATUS dcesrv_setup_endpoint_sockets(struct tevent_context *ev_ctx,
 		break;
 
 	case NCACN_NP:
-		status = dcesrv_create_ncacn_np_socket(e, &fd);
+		status = dcesrv_create_ncacn_np_socket(
+			e->ep_description, &fd);
 		break;
 
 	default: