diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-11-15 23:03:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-11-16 10:05:32 +1100 |
| commit | 26f3f3bbc69196d908cad6558c8c7dc5beb8d74a (patch) | |
| tree | d268faa80f4bca54be077ebe67faa44bf41c3c3d | |
| parent | 050c335c8da43741ed0df2570ebfbd5d1dfd0a31 (diff) | |
| download | openssh-26f3f3bbc69196d908cad6558c8c7dc5beb8d74a.tar.gz | |
upstream: when connecting via socket (the default case), filter
addresses by AddressFamily if one was specified. Fixes the case where, if
CanonicalizeHostname is enabled, ssh may ignore AddressFamily. bz5326; ok
dtucker
OpenBSD-Commit-ID: 6c7d7751f6cd055126b2b268a7b64dcafa447439
| -rw-r--r-- | sshconnect.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index e6012f01e..ff3d3501f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.363 2023/03/10 07:17:08 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.364 2023/11/15 23:03:38 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -481,6 +481,14 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, errno = oerrno; continue; } + if (options.address_family != AF_UNSPEC && + ai->ai_family != options.address_family) { + debug2_f("skipping address [%s]:%s: " + "wrong address family", ntop, strport); + errno = 0; + continue; + } + debug("Connecting to %.200s [%.100s] port %s.", host, ntop, strport); |