From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 12 Jan 2023 10:35:11 +0000 (+0100)
Subject: lib/tsocket: make use of samba_socket_sock_error()
X-Git-Tag: talloc-2.4.2~1194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66b2563722013f4a15c34a1117c98f562bb2a65c;p=thirdparty%2Fsamba.git

lib/tsocket: make use of samba_socket_sock_error()

This is nicer than calling getsockopt(state->fd, SOL_SOCKET, SO_ERROR)
directly.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 50ac0b280ab..9f3f00f107f 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -2613,18 +2613,10 @@ static void tstream_bsd_connect_fde_handler(struct tevent_context *ev,
 					struct tstream_bsd_connect_state);
 	struct samba_sockaddr *lrbsda = NULL;
 	int ret;
-	int error=0;
-	socklen_t len = sizeof(error);
 	int err;
 	bool retry;
 
-	ret = getsockopt(state->fd, SOL_SOCKET, SO_ERROR, &error, &len);
-	if (ret == 0) {
-		if (error != 0) {
-			errno = error;
-			ret = -1;
-		}
-	}
+	ret = samba_socket_sock_error(state->fd);
 	err = tsocket_bsd_error_from_errno(ret, errno, &retry);
 	if (retry) {
 		/* retry later */