From nobody Tue Nov 04 20:16:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d1KTm2ptgz6FDRg; Tue, 04 Nov 2025 20:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d1KTm25Rsz3Bvk; Tue, 04 Nov 2025 20:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762287372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQGqBacVCJ8fc8W1zuDOrVXB6t6zEZPTT9arKoiVzy0=; b=nREXIwxTs+eKPKiHm/pyoCvJ797wOAu9MdTWsQKdoMRrWqgQCzBHyS/UVmXC7OR0PSTd0F kFL/uc/J/VKPZLWW9ZLjvaijSUyhmNvNP/+//WfT9iGrnb/8ejNrOMNqRKuLurUT/zwvJA kcvODSEsR2T9k9rjyVJn+ZgJHWAOAgAOIFmDCKK2u2bYjuvCiMydt+didNsnGoLj0Snd6C eaNNsq0qleQs67YiZp7JYMb84wKcP7FoBreuAdoqoi91Fp6jA0u/ziLICdPxsxsmLvxMGM sZWyfwR3zfoqPENeNxEVp+UzZWhwd6TpSDduS+J0cLSIWp6LPb8+rOhi1k29Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762287372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FQGqBacVCJ8fc8W1zuDOrVXB6t6zEZPTT9arKoiVzy0=; b=hTeZ9VijClwKC1TV62UcLfkL7gO5ljJvCcju2DLMAfSPuN/X5EjRC6bvwBWgri6nfKK/oH SZzgLOqce6WEjyFea52gTMqmRCV4aPCysmIJdLMN5OJNKUcLCYc29cgk7lLy+zUbr4E1v0 wa96eFPfO8kPR2ll8BqjMT/1Xha0iaq6BBISSNJ06gVa2mnTX3TI9tHhWkJhBqUbaTeOtO zAS6gBLVlcaFIRGewR1+IXNV53gW0zo+TW1uBtj5OgNtidRTEzGgACrqYojqNYaSJmOpzC fEkW7IsMbMkWERH1CIWg0b0Bwzpwzn/30fa95SeytY7gqCUnZtlkwm26WsmKTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762287372; a=rsa-sha256; cv=none; b=cV74Zv5noFSwwzVKXL2HQrnDNpxFW45wXVSrdUEanpR5JXHN5KHou6bKpiTTtuOxOC98uf CPmo1eNoL/jJTz7RZ7XUjAUwsNu7rEZSryMoTzYst+F365JYoW0VDTsQmerbnlBaVchPkl VaIom+XQpwR3L/fYUwoM0c1HKDGmgRsh4EkhiMnBXCR+lpP0qwUeH9an2+sYbjKcgCppxz sbzErZJDtWAXAjWucal0w+j1L6xw4tQgwfuWTb3wuqsMhGUTn9StuBl8tza7X/fQG1H8Tc 5YIq/09WWrjRbPGGBGeWEZMG/q540YCIsYDmUJpkLr/7L3A7l6ztiuaiKYfMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d1KTm1fNSz1BK6; Tue, 04 Nov 2025 20:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4KGC83046791; Tue, 4 Nov 2025 20:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4KGCAG046788; Tue, 4 Nov 2025 20:16:12 GMT (envelope-from git) Date: Tue, 4 Nov 2025 20:16:12 GMT Message-Id: <202511042016.5A4KGCAG046788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 96e215ad8173 - main - Revert "openssh: Don't try to bind to unsupported addresses" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96e215ad8173185337cf3057b80f2a0723ca201a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=96e215ad8173185337cf3057b80f2a0723ca201a commit 96e215ad8173185337cf3057b80f2a0723ca201a Author: Dag-Erling Smørgrav AuthorDate: 2025-11-04 20:13:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-04 20:13:11 +0000 Revert "openssh: Don't try to bind to unsupported addresses" This doesn't actually do anything useful, since getifaddrs() will only return supported addresses. The root cause of the issue described in the PR lies earlier in the connection timeline, around the start of the ssh_create_socket() function. This reverts commit e5ff8e7977434b150a66bb3e472c6d0e0f644cfa. PR: 195231 --- crypto/openssh/sshconnect.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index cb45d719f961..c86182d13673 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -303,8 +303,6 @@ check_ifaddrs(const char *ifname, int af, const struct ifaddrs *ifaddrs, * Prefer addresses that are not loopback or linklocal, but use them * if nothing else matches. */ - int inet_supported = feature_present("inet"); - int inet6_supported = feature_present("inet6"); for (allow_local = 0; allow_local < 2; allow_local++) { for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) { if (ifa->ifa_addr == NULL || ifa->ifa_name == NULL || @@ -314,8 +312,6 @@ check_ifaddrs(const char *ifname, int af, const struct ifaddrs *ifaddrs, continue; switch (ifa->ifa_addr->sa_family) { case AF_INET: - if (!inet_supported) - continue; sa = (struct sockaddr_in *)ifa->ifa_addr; if (!allow_local && sa->sin_addr.s_addr == htonl(INADDR_LOOPBACK)) @@ -328,8 +324,6 @@ check_ifaddrs(const char *ifname, int af, const struct ifaddrs *ifaddrs, memcpy(resultp, sa, *rlenp); return 0; case AF_INET6: - if (!inet6_supported) - continue; sa6 = (struct sockaddr_in6 *)ifa->ifa_addr; v6addr = &sa6->sin6_addr; if (!allow_local &&