summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2015-02-20 22:40:32 +0000
committerdjm <djm@openbsd.org>2015-02-20 22:40:32 +0000
commitc51e579657031e7fce00f839aff003b8058bb08f (patch)
tree292bb17416b9499bb4ffe4246886e200bfbb63aa
parentCompletely delete all carriage return characters from the input. (diff)
downloadwireguard-openbsd-c51e579657031e7fce00f839aff003b8058bb08f.tar.xz
wireguard-openbsd-c51e579657031e7fce00f839aff003b8058bb08f.zip
more options that are available under Match;
bz#2353 reported by calestyo AT scientia.net
-rw-r--r--usr.bin/ssh/sshd_config.514
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index d116df6e3b4..03311cc1053 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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.192 2015/02/02 01:57:44 deraadt Exp $
-.Dd $Mdocdate: February 2 2015 $
+.\" $OpenBSD: sshd_config.5,v 1.193 2015/02/20 22:40:32 djm Exp $
+.Dd $Mdocdate: February 20 2015 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -969,6 +969,7 @@ Available keywords are
.Cm AcceptEnv ,
.Cm AllowAgentForwarding ,
.Cm AllowGroups ,
+.Cm AllowStreamLocalForwarding ,
.Cm AllowTcpForwarding ,
.Cm AllowUsers ,
.Cm AuthenticationMethods ,
@@ -981,11 +982,12 @@ Available keywords are
.Cm DenyGroups ,
.Cm DenyUsers ,
.Cm ForceCommand ,
-.Cm GatewayPorts ,
.Cm GSSAPIAuthentication ,
+.Cm GatewayPorts ,
.Cm HostbasedAcceptedKeyTypes ,
.Cm HostbasedAuthentication ,
.Cm HostbasedUsesNameFromPacketOnly ,
+.Cm IPQoS ,
.Cm KbdInteractiveAuthentication ,
.Cm KerberosAuthentication ,
.Cm MaxAuthTries ,
@@ -999,9 +1001,13 @@ Available keywords are
.Cm PermitUserRC ,
.Cm PubkeyAcceptedKeyTypes ,
.Cm PubkeyAuthentication ,
+.Cm RSAAuthentication ,
.Cm RekeyLimit ,
+.Cm RevokedKeys ,
.Cm RhostsRSAAuthentication ,
-.Cm RSAAuthentication ,
+.Cm StreamLocalBindMask ,
+.Cm StreamLocalBindUnlink ,
+.Cm TrustedUserCAKeys ,
.Cm X11DisplayOffset ,
.Cm X11Forwarding
and