From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 15 Sep 2024 03:35:30 +0000 (+0200)
Subject: s3:rpc_client: make use of struct samba_sockaddr in rpc_pipe_open_ncalrpc()
X-Git-Tag: samba-4.21.7~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daefb7b24366deb5021826bd7922f0a53f404386;p=thirdparty%2Fsamba.git

s3:rpc_client: make use of struct samba_sockaddr in rpc_pipe_open_ncalrpc()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit d406f9fffede27220f4d589c8ab3c7210ca01b74)
---

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 1e02f53efe9..645820de191 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -3046,8 +3046,14 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx,
 {
 	char *socket_name = NULL;
 	struct rpc_pipe_client *result;
-	struct sockaddr_un addr = { .sun_family = AF_UNIX };
-	socklen_t salen = sizeof(addr);
+	struct samba_sockaddr saddr = {
+		.sa_socklen = sizeof(struct sockaddr_un),
+		.u = {
+			.un = {
+				.sun_family = AF_UNIX,
+			},
+		},
+	};
 	int pathlen;
 	NTSTATUS status;
 	int fd = -1;
@@ -3066,12 +3072,12 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx,
 	}
 
 	pathlen = snprintf(
-		addr.sun_path,
-		sizeof(addr.sun_path),
+		saddr.u.un.sun_path,
+		sizeof(saddr.u.un.sun_path),
 		"%s/%s",
 		lp_ncalrpc_dir(),
 		socket_name);
-	if ((pathlen < 0) || ((size_t)pathlen >= sizeof(addr.sun_path))) {
+	if ((pathlen < 0) || ((size_t)pathlen >= sizeof(saddr.u.un.sun_path))) {
 		DBG_DEBUG("socket_path for %s too long\n", socket_name);
 		status = NT_STATUS_NAME_TOO_LONG;
 		goto fail;
@@ -3102,9 +3108,9 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	if (connect(fd, (struct sockaddr *)(void *)&addr, salen) == -1) {
+	if (connect(fd, &saddr.u.sa, saddr.sa_socklen) == -1) {
 		DBG_WARNING("connect(%s) failed: %s\n",
-			    addr.sun_path,
+			    saddr.u.un.sun_path,
 			    strerror(errno));
 		status = map_nt_error_from_unix(errno);
 		goto fail;