40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6 Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Mon, 20 Nov 2023 02:50:00 +0000
|
|
Subject: [PATCH] upstream: set errno=EAFNOSUPPORT when filtering addresses
|
|
that don't
|
|
|
|
match AddressFamily; yields slightly better error message if no address
|
|
matches. bz#3526
|
|
|
|
OpenBSD-Commit-ID: 29cea900ddd8b04a4d1968da5c4a893be2ebd9e6
|
|
|
|
Reference:https://github.com/openssh/openssh-portable/commit/c52db0114826d73eff6cdbf205e9c1fa4f7ca6c6
|
|
Conflict:NA
|
|
---
|
|
sshconnect.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sshconnect.c b/sshconnect.c
|
|
index ff3d3501f..bd077c75c 100644
|
|
--- a/sshconnect.c
|
|
+++ b/sshconnect.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: sshconnect.c,v 1.364 2023/11/15 23:03:38 djm Exp $ */
|
|
+/* $OpenBSD: sshconnect.c,v 1.365 2023/11/20 02:50:00 djm Exp $ */
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
@@ -485,7 +485,7 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
|
|
ai->ai_family != options.address_family) {
|
|
debug2_f("skipping address [%s]:%s: "
|
|
"wrong address family", ntop, strport);
|
|
- errno = 0;
|
|
+ errno = EAFNOSUPPORT;
|
|
continue;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|