git: f7c08d8dd810 - main - openssh: Move back UseBlocklist to global config
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Jul 2026 18:13:38 UTC
The branch main has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=f7c08d8dd810d031e5b2e53cbaa102a9105ada3f
commit f7c08d8dd810d031e5b2e53cbaa102a9105ada3f
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-07-28 18:12:36 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
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) \