Wed Feb 1 14:27:37 2017 UTC ()
match the man page, and explain why.


(christos)
diff -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/sshd_config

cvs diff -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/sshd_config (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/dist/sshd_config 2016/12/25 00:07:47 1.18
+++ src/crypto/external/bsd/openssh/dist/sshd_config 2017/02/01 14:27:37 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sshd_config,v 1.18 2016/12/25 00:07:47 christos Exp $ 1# $NetBSD: sshd_config,v 1.19 2017/02/01 14:27:37 christos Exp $
2# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $ 2# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $
3 3
4# This is the sshd server system-wide configuration file. See 4# This is the sshd server system-wide configuration file. See
5# sshd_config(5) for more information. 5# sshd_config(5) for more information.
6 6
7# The strategy used for options in the default sshd_config shipped with 7# The strategy used for options in the default sshd_config shipped with
8# OpenSSH is to specify options with their default value where 8# OpenSSH is to specify options with their default value where
9# possible, but leave them commented. Uncommented options override the 9# possible, but leave them commented. Uncommented options override the
10# default value. 10# default value.
11 11
12#Port 22 12#Port 22
13#AddressFamily any 13#AddressFamily any
14#ListenAddress 0.0.0.0 14#ListenAddress 0.0.0.0
@@ -18,27 +18,28 @@ @@ -18,27 +18,28 @@
18#HostKey /etc/ssh/ssh_host_dsa_key 18#HostKey /etc/ssh/ssh_host_dsa_key
19#HostKey /etc/ssh/ssh_host_ecdsa_key 19#HostKey /etc/ssh/ssh_host_ecdsa_key
20#HostKey /etc/ssh/ssh_host_ed25519_key 20#HostKey /etc/ssh/ssh_host_ed25519_key
21 21
22# Ciphers and keying 22# Ciphers and keying
23#RekeyLimit default none 23#RekeyLimit default none
24 24
25# Logging 25# Logging
26#SyslogFacility AUTH 26#SyslogFacility AUTH
27#LogLevel INFO 27#LogLevel INFO
28 28
29# Authentication: 29# Authentication:
30 30
31#LoginGraceTime 2m 31# For slow CPUs, bumped from 2 minutes to 10
 32LoginGraceTime 600
32#PermitRootLogin prohibit-password 33#PermitRootLogin prohibit-password
33#StrictModes yes 34#StrictModes yes
34#MaxAuthTries 6 35#MaxAuthTries 6
35#MaxSessions 10 36#MaxSessions 10
36 37
37#PubkeyAuthentication yes 38#PubkeyAuthentication yes
38 39
39# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 40# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
40# but this is overridden so installations will only check .ssh/authorized_keys 41# but this is overridden so installations will only check .ssh/authorized_keys
41AuthorizedKeysFile .ssh/authorized_keys 42AuthorizedKeysFile .ssh/authorized_keys
42 43
43#AuthorizedPrincipalsFile none 44#AuthorizedPrincipalsFile none
44 45