From 4c414d99f3a8c2b3d24ee8448b8a388446531ebb Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 6 Aug 2026 23:30:30 +1000 Subject: [PATCH] Re-allow PAMServiceName inside a Match block. This is documented to be allowed, and was up until 10.4p1 when a transcription error in the config handling rework reverted it to global-only, ie not allowed inside Match. bz#3987. --- servconf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servconf.h b/servconf.h index a2345e88a..3648e2be1 100644 --- a/servconf.h +++ b/servconf.h @@ -273,11 +273,11 @@ SSHCONF_ALIAS(KeepAlive, TCPKeepAlive, SSHCFG_GLOBAL) #ifdef USE_PAM #define SSHD_CONFIG_ENTRIES_PAM \ SSHCONF_INTFLAG(use_pam, UsePAM, SSHCFG_GLOBAL, 0, SSHCFG_COPY_NONE) \ -SSHCONF_STRING(pam_service_name, PAMServiceName, SSHCFG_GLOBAL, SSHCFG_COPY_NONE) +SSHCONF_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL, SSHCFG_COPY_NONE) #else #define SSHD_CONFIG_ENTRIES_PAM \ SSHCONF_UNSUPPORTED_INT(use_pam, UsePAM, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_GLOBAL) +SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL) #endif #ifdef DISABLE_LASTLOG -- 2.47.3