From: Damien Miller <djm@mindrot.org>
Date: Wed, 21 May 2025 09:14:47 +0000 (+1000)
Subject: pull a small netcat SOCKS4A fix from upstream
X-Git-Tag: V_10_1_P1~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71773c20d566fa5dcaf9edf3139bdcb3f2c4bc2;p=thirdparty%2Fopenssh-portable.git

pull a small netcat SOCKS4A fix from upstream
---

diff --git a/regress/netcat.c b/regress/netcat.c
index 51e999df6..1eac0218a 100644
--- a/regress/netcat.c
+++ b/regress/netcat.c
@@ -1589,9 +1589,11 @@ socks_connect(const char *host, const char *port,
 			errx(1, "connection failed, unsupported address type");
 		}
 	} else if (socksv == 4 || socksv == 44) {
-		/* This will exit on lookup failure */
-		decode_addrport(host, port, (struct sockaddr *)&addr,
-		    sizeof(addr), 1, 0);
+		if (socksv == 4) {
+			/* This will exit on lookup failure */
+			decode_addrport(host, port, (struct sockaddr *)&addr,
+			    sizeof(addr), 1, 0);
+		}
 
 		/* Version 4 */
 		buf[0] = SOCKS_V4;