From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 13 Nov 2015 02:57:46 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b9108f5b561c83612cb97ece4134eb59fde071;p=thirdparty%2Fopenssh-portable.git

upstream commit

list a couple more options usable in Match blocks;
 bz#2489

Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879
---

diff --git a/sshd_config.5 b/sshd_config.5
index 149dc7e14..3eb1bb8e0 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.213 2015/10/07 14:45:30 sobrado Exp $
-.Dd $Mdocdate: October 7 2015 $
+.\" $OpenBSD: sshd_config.5,v 1.214 2015/11/13 02:57:46 djm Exp $
+.Dd $Mdocdate: November 13 2015 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1094,6 +1094,8 @@ Available keywords are
 .Cm AuthorizedKeysCommand ,
 .Cm AuthorizedKeysCommandUser ,
 .Cm AuthorizedKeysFile ,
+.Cm AuthorizedPrincipalsCommand ,
+.Cm AuthorizedPrincipalsCommandUser ,
 .Cm AuthorizedPrincipalsFile ,
 .Cm Banner ,
 .Cm ChrootDirectory ,