From nobody Tue Jul 28 18:13:38 2026 X-Original-To: dev-commits-src-all@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 4h8k9g3Qjyz6n55B for ; Tue, 28 Jul 2026 18:13:43 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8k9g2vW7z3mbs for ; Tue, 28 Jul 2026 18:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785262423; 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=7SGCk9C3o3bdOaFKrMU/6SYMFcTzleEfCays5xT4tSA=; b=RuVLA2KG/wcwSjCM1Qwy/ewCPEjktXGqrEobaw5VzZ32/k1OpASdM1fbgDJFDV2qMwu2U9 GErABIQv4+uG/P+CHFeKUDAL2jiZX5YvfDgtKyxee2JnUsNUUu0TKTUFiQfYDR0b96W7lf q+bbHkHXIzPG1w60AWlP/AFiTK92YwG6QB9LnqPs+cZSw0jLNjLlM9PzO9ba5b/T/JEtZ5 7O/4OkkPwyLTUUGLCNGV3fetNFv/IuhHNs5HEBNSj1OvISDlqUGidFWf++sor8FY0K5eXl 1jxka66ndetyB7MjlMyRDUpiMgQB86PjzkEyIG0K3uS/yBA7Z1uHo7A7W90q1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785262423; a=rsa-sha256; cv=none; b=vrFbORHD6uU6aU7k0PmO/jjTeg1dGxZ73jDJ58ebmKhNeAEjOhjzpjmQBHPLlf9/Lk3US9 GpwQZneY3ve3tWE4GniEkbvjN/xaM7q+b60HF11Ec1wXeApNMKgvpvUuv+alV8yL5IG5tF V83a2BVhGzq3GXiX7Xv3WibyDNn52pE70pxR1CVw5Hn5at38TCf0WRoFRnGGUA2e0taLGH c0vh/f6q21XStaZhuoOto8T4L4bveKaz/ZHwDxbcF/+RHslZAaO9q45PLJqY3fMni8KSW7 QOjGERyQMd7BrgyNQTEeG3b3XRj+i3YWiZQe8jU7Gjh98RKV9gjNok0lW2/tDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785262423; 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=7SGCk9C3o3bdOaFKrMU/6SYMFcTzleEfCays5xT4tSA=; b=abptBSLtv8wRL6zYnjOuhkORpaD2z9dBr5C5QDUqJ2JswiYbZsyTkVF3wi1GCMXQBpniPi ss3KW2fGNzxNBWZtP/8lrng7nnTw5K99nE5pr3IP6GdqOkx8agtHixOZPFTMErJdAP6OuZ BKeKJFGCKsNyR0iF5oWkdEEf4CAfTgdv6TIDn66xfM3f3UVKKMsD4eT3svCtKHOVhbc7d8 nqX6XXSHEJwVe+2Oeu+eZ+NEvYYJeqx7kCHs0oezQv/xRat83D0sduwjrFRwMUS/8WeKqv sA9LAqzzDFVftkRt7CXPu3SUGvMqeGIGDHecGHktP+0bcLlY/fdNPTnwB/0atw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8k9g1kwCzrcx for ; Tue, 28 Jul 2026 18:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 18:13:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: f7c08d8dd810 - main - openssh: Move back UseBlocklist to global config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c08d8dd810d031e5b2e53cbaa102a9105ada3f Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 18:13:38 +0000 Message-Id: <6a68f152.3ce2b.46406e21@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c08d8dd810d031e5b2e53cbaa102a9105ada3f commit f7c08d8dd810d031e5b2e53cbaa102a9105ada3f Author: Jose Luis Duran AuthorDate: 2026-07-28 18:12:36 +0000 Commit: Jose Luis Duran CommitDate: 2026-07-28 18:13:12 +0000 openssh: Move back UseBlocklist to global config Revert UseBlocklist from SSHCFG_ALL to SSHCFG_GLOBAL (with SSHCFG_COPY_NONE), ensuring it can only be set globally in sshd_config rather than within conditional Match blocks, matching historical behavior. Reviewed by: emaste Fixes: bb5c77e9d281 ("OpenSSH: Update to 10.4p1") Differential Revision: https://reviews.freebsd.org/D58520 --- crypto/openssh/servconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h index 27cabdb070bb..1f88284230bb 100644 --- a/crypto/openssh/servconf.h +++ b/crypto/openssh/servconf.h @@ -236,7 +236,7 @@ SSHCONF_INT(unused_connection_timeout, UnusedConnectionTimeout, SSHCFG_ALL, NULL SSHCONF_STRING(sshd_session_path, SshdSessionPath, SSHCFG_GLOBAL, SSHCFG_COPY_NONE) \ SSHCONF_STRING(sshd_auth_path, SshdAuthPath, SSHCFG_GLOBAL, SSHCFG_COPY_NONE) \ SSHCONF_INTFLAG(refuse_connection, RefuseConnection, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \ -SSHCONF_INTFLAG(use_blocklist, UseBlocklist, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) +SSHCONF_INTFLAG(use_blocklist, UseBlocklist, SSHCFG_GLOBAL, 0, SSHCFG_COPY_NONE) #define SSHD_CONFIG_ENTRIES_LEGACY \ SSHCONF_DEPRECATE(ServerKeyBits, SSHCFG_GLOBAL, SSHCONF_DEPRECATED) \