From: Volker Lendecke <vl@samba.org>
Date: Mon, 11 Jan 2021 20:35:26 +0000 (+0100)
Subject: rpc_server: Use make_base_pipes_struct() in make_internal_rpc_pipe_socketpair()
X-Git-Tag: samba-4.14.0rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=562e48655ccc583fdb7c90ae509b092abc634a4d;p=thirdparty%2Fsamba.git

rpc_server: Use make_base_pipes_struct() in make_internal_rpc_pipe_socketpair()

make_server_pipes_struct() is just a simple wrapper.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Samuel Cabrero <scabrero@samba.org>
---

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index d80c62e75d7..9ba271c2479 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -99,7 +99,6 @@ NTSTATUS make_internal_rpc_pipe_socketpair(
 	struct dcesrv_connection *dcesrv_conn = NULL;
 	struct npa_state *npa;
 	NTSTATUS status;
-	int error;
 	int rc;
 	enum dcerpc_transport_t transport = dcerpc_binding_get_transport(
 			endpoint->ep_description);
@@ -176,16 +175,15 @@ NTSTATUS make_internal_rpc_pipe_socketpair(
 		goto out;
 	}
 
-	rc = make_server_pipes_struct(ncacn_conn,
-				      ncacn_conn->msg_ctx,
-				      pipe_name,
-				      transport,
-				      ncacn_conn->remote_client_addr,
-				      ncacn_conn->local_server_addr,
-				      &ncacn_conn->p,
-				      &error);
-	if (rc == -1) {
-		status = map_nt_error_from_unix(error);
+	rc = make_base_pipes_struct(ncacn_conn,
+				    ncacn_conn->msg_ctx,
+				    pipe_name,
+				    transport,
+				    ncacn_conn->remote_client_addr,
+				    ncacn_conn->local_server_addr,
+				    &ncacn_conn->p);
+	if (rc != 0) {
+		status = map_nt_error_from_unix(rc);
 		goto out;
 	}