diff options
| author | Jose Luis Duran <jlduran@FreeBSD.org> | 2026-07-28 18:12:36 +0000 |
|---|---|---|
| committer | Jose Luis Duran <jlduran@FreeBSD.org> | 2026-07-28 18:13:12 +0000 |
| commit | f7c08d8dd810d031e5b2e53cbaa102a9105ada3f (patch) | |
| tree | b5fbf875c936326f4664463f2d50506838d63fd2 | |
| parent | 53187a3665e50b7fbc74c92daf22dc3ddf676787 (diff) | |
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
| -rw-r--r-- | crypto/openssh/servconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) \ |