[openssh-commits] [openssh] branch V_10_5 updated: allow PAMServiceName in Match (regressed in 10.4)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch V_10_5
in repository openssh.

The following commit(s) were added to refs/heads/V_10_5 by this push:
     new 1fedf0959 allow PAMServiceName in Match (regressed in 10.4)
1fedf0959 is described below

commit 1fedf0959b6bf910c4a2fe02689085f5e83e3d81
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Tue Sep 1 15:52:38 2026 +1000

    allow PAMServiceName in Match (regressed in 10.4)
    
    During the refactor of server option parsing, the ability to set
    PAMServiceName in Match blocks was accidentally disabled.
    
    Reported by Kanishka De Silva; ok markus
---
 servconf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servconf.h b/servconf.h
index 3648e2be1..de5fe6dad 100644
--- a/servconf.h
+++ b/servconf.h
@@ -273,7 +273,7 @@ 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_ALL, SSHCFG_COPY_NONE)
+SSHCONF_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL, SSHCFG_COPY_MATCH)
 #else
 #define SSHD_CONFIG_ENTRIES_PAM \
 SSHCONF_UNSUPPORTED_INT(use_pam, UsePAM, SSHCFG_GLOBAL) \

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.