upstream commit

more options that are available under Match; bz#2353 reported
 by calestyo AT scientia.net
This commit is contained in:
djm@openbsd.org 2015-02-20 22:40:32 +00:00 committed by Damien Miller
parent 44732de068
commit 18a208d6a4
1 changed files with 11 additions and 5 deletions

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.192 2015/02/02 01:57:44 deraadt Exp $ .\" $OpenBSD: sshd_config.5,v 1.193 2015/02/20 22:40:32 djm Exp $
.Dd $Mdocdate: February 2 2015 $ .Dd $Mdocdate: February 20 2015 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -968,6 +968,7 @@ Available keywords are
.Cm AcceptEnv , .Cm AcceptEnv ,
.Cm AllowAgentForwarding , .Cm AllowAgentForwarding ,
.Cm AllowGroups , .Cm AllowGroups ,
.Cm AllowStreamLocalForwarding ,
.Cm AllowTcpForwarding , .Cm AllowTcpForwarding ,
.Cm AllowUsers , .Cm AllowUsers ,
.Cm AuthenticationMethods , .Cm AuthenticationMethods ,
@ -980,11 +981,12 @@ Available keywords are
.Cm DenyGroups , .Cm DenyGroups ,
.Cm DenyUsers , .Cm DenyUsers ,
.Cm ForceCommand , .Cm ForceCommand ,
.Cm GatewayPorts ,
.Cm GSSAPIAuthentication , .Cm GSSAPIAuthentication ,
.Cm GatewayPorts ,
.Cm HostbasedAcceptedKeyTypes , .Cm HostbasedAcceptedKeyTypes ,
.Cm HostbasedAuthentication , .Cm HostbasedAuthentication ,
.Cm HostbasedUsesNameFromPacketOnly , .Cm HostbasedUsesNameFromPacketOnly ,
.Cm IPQoS ,
.Cm KbdInteractiveAuthentication , .Cm KbdInteractiveAuthentication ,
.Cm KerberosAuthentication , .Cm KerberosAuthentication ,
.Cm MaxAuthTries , .Cm MaxAuthTries ,
@ -998,9 +1000,13 @@ Available keywords are
.Cm PermitUserRC , .Cm PermitUserRC ,
.Cm PubkeyAcceptedKeyTypes , .Cm PubkeyAcceptedKeyTypes ,
.Cm PubkeyAuthentication , .Cm PubkeyAuthentication ,
.Cm RekeyLimit ,
.Cm RhostsRSAAuthentication ,
.Cm RSAAuthentication , .Cm RSAAuthentication ,
.Cm RekeyLimit ,
.Cm RevokedKeys ,
.Cm RhostsRSAAuthentication ,
.Cm StreamLocalBindMask ,
.Cm StreamLocalBindUnlink ,
.Cm TrustedUserCAKeys ,
.Cm X11DisplayOffset , .Cm X11DisplayOffset ,
.Cm X11Forwarding .Cm X11Forwarding
and and