From: Volker Lendecke <vl@samba.org>
Date: Sun, 10 Jan 2021 17:42:18 +0000 (+0100)
Subject: rpc_client: Simplify rpc_pipe_open_ncalrpc()
X-Git-Tag: samba-4.14.0rc1~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b054aa0a52489ac183a47c2b2cdc66228d53738;p=thirdparty%2Fsamba.git

rpc_client: Simplify rpc_pipe_open_ncalrpc()

Consolidate close(fd)

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

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 040bd7cda90..8f52acadec8 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2925,7 +2925,7 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
 	socklen_t salen = sizeof(addr);
 	size_t pathlen;
 	NTSTATUS status;
-	int fd;
+	int fd = -1;
 
 	pathlen = strlcpy(addr.sun_path, socket_path, sizeof(addr.sun_path));
 	if (pathlen >= sizeof(addr.sun_path)) {
@@ -2966,15 +2966,14 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
 		DEBUG(0, ("connect(%s) failed: %s\n", socket_path,
 			  strerror(errno)));
 		status = map_nt_error_from_unix(errno);
-		close(fd);
 		goto fail;
 	}
 
 	status = rpc_transport_sock_init(result, fd, &result->transport);
 	if (!NT_STATUS_IS_OK(status)) {
-		close(fd);
 		goto fail;
 	}
+	fd = -1;
 
 	result->transport->transport = NCALRPC;
 
@@ -2988,6 +2987,9 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
 	return NT_STATUS_OK;
 
  fail:
+	if (fd != -1) {
+		close(fd);
+	}
 	TALLOC_FREE(result);
 	return status;
 }