From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Sat, 9 Oct 2021 10:52:42 +0000 (+0000)
Subject: upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and
X-Git-Tag: V_8_9_P1~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=002d65b0a30063c6e49bf8a53e709d8d5a0d45c1;p=thirdparty%2Fopenssh-portable.git

upstream: Document that CASignatureAlgorithms, ExposeAuthInfo and

PubkeyAuthOptions can be used in a Match block.  Patch from eehakkin via
github PR#277.

OpenBSD-Commit-ID: c0a63f5f52e918645967ac022b28392da4b866aa
---

diff --git a/sshd_config.5 b/sshd_config.5
index a8d0545c3..2cea00f4c 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.335 2021/09/03 05:25:50 dtucker Exp $
-.Dd $Mdocdate: September 3 2021 $
+.\" $OpenBSD: sshd_config.5,v 1.336 2021/10/09 10:52:42 dtucker Exp $
+.Dd $Mdocdate: October 9 2021 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1190,12 +1190,14 @@ Available keywords are
 .Cm AuthorizedPrincipalsCommandUser ,
 .Cm AuthorizedPrincipalsFile ,
 .Cm Banner ,
+.Cm CASignatureAlgorithms ,
 .Cm ChrootDirectory ,
 .Cm ClientAliveCountMax ,
 .Cm ClientAliveInterval ,
 .Cm DenyGroups ,
 .Cm DenyUsers ,
 .Cm DisableForwarding ,
+.Cm ExposeAuthInfo ,
 .Cm ForceCommand ,
 .Cm GatewayPorts ,
 .Cm GSSAPIAuthentication ,
@@ -1220,6 +1222,7 @@ Available keywords are
 .Cm PermitUserRC ,
 .Cm PubkeyAcceptedAlgorithms ,
 .Cm PubkeyAuthentication ,
+.Cm PubkeyAuthOptions ,
 .Cm RekeyLimit ,
 .Cm RevokedKeys ,
 .Cm RDomain ,