[openssh-commits] [openssh] branch master updated: pull a small netcat SOCKS4A fix from upstream

git+noreply at mindrot.org git+noreply at mindrot.org
Wed May 21 19:15:04 AEST 2025


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new b71773c20 pull a small netcat SOCKS4A fix from upstream
b71773c20 is described below

commit b71773c20d566fa5dcaf9edf3139bdcb3f2c4bc2
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Wed May 21 19:14:47 2025 +1000

    pull a small netcat SOCKS4A fix from upstream
---
 regress/netcat.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list