Add new configuration option CanonicalMatchUser on RHEL/CentOS

Jakuje · Jakuje · commit 65943052cae3 · 2025-11-12T19:03:08.000+01:00
Signed-off-by: Jakub Jelen &lt;jjelen@redhat.com&gt;
diff --git a/meta/options_body b/meta/options_body
@@ -18,6 +18,7 @@ AuthorizedPrincipalsCommand
 AuthorizedPrincipalsCommandUser
 AuthorizedPrincipalsFile
 Banner
+CanonicalMatchUser
 CASignatureAlgorithms
 ChallengeResponseAuthentication
 ChannelTimeout
diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2
@@ -151,6 +151,7 @@ Match {{ match["Condition"] }}
 {{ body_option("AuthorizedPrincipalsCommandUser",sshd_AuthorizedPrincipalsCommandUser) -}}
 {{ body_option("AuthorizedPrincipalsFile",sshd_AuthorizedPrincipalsFile) -}}
 {{ body_option("Banner",sshd_Banner) -}}
+{{ body_option("CanonicalMatchUser",sshd_CanonicalMatchUser) -}}
 {{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}}
 {{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}}
 {{ body_option("ChannelTimeout",sshd_ChannelTimeout) -}}
diff --git a/templates/sshd_config_snippet.j2 b/templates/sshd_config_snippet.j2
@@ -149,6 +149,7 @@ Match {{ match["Condition"] }}
 {{ body_option("AuthorizedPrincipalsCommandUser",sshd_AuthorizedPrincipalsCommandUser) -}}
 {{ body_option("AuthorizedPrincipalsFile",sshd_AuthorizedPrincipalsFile) -}}
 {{ body_option("Banner",sshd_Banner) -}}
+{{ body_option("CanonicalMatchUser",sshd_CanonicalMatchUser) -}}
 {{ body_option("CASignatureAlgorithms",sshd_CASignatureAlgorithms) -}}
 {{ body_option("ChallengeResponseAuthentication",sshd_ChallengeResponseAuthentication) -}}
 {{ body_option("ChannelTimeout",sshd_ChannelTimeout) -}}
