[openssh-commits] [openssh] 03/10: upstream commit

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit b6b9108f5b561c83612cb97ece4134eb59fde071
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Nov 13 02:57:46 2015 +0000

    upstream commit
    
    list a couple more options usable in Match blocks;
     bz#2489
    
    Upstream-ID: e4d03f39d254db4c0cc54101921bb89fbda19879
---
 sshd_config.5 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sshd_config.5 b/sshd_config.5
index 149dc7e..3eb1bb8 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 ,

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