diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2015-07-30 19:23:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-08-02 19:59:25 +1000 |
commit | f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0 (patch) | |
tree | b8e3396035624e97e931d2058a84487f2ad9463e /sshd_config | |
parent | 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c (diff) |
upstream commit
change default: PermitRootLogin without-password matching
install script changes coming as well ok djm markus
Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6
Diffstat (limited to 'sshd_config')
-rw-r--r-- | sshd_config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd_config b/sshd_config index cf7d8e1e8..46df1622f 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.95 2015/04/27 21:42:48 djm Exp $ | 1 | # $OpenBSD: sshd_config,v 1.96 2015/07/30 19:23:02 deraadt Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
@@ -41,7 +41,7 @@ | |||
41 | # Authentication: | 41 | # Authentication: |
42 | 42 | ||
43 | #LoginGraceTime 2m | 43 | #LoginGraceTime 2m |
44 | #PermitRootLogin no | 44 | #PermitRootLogin without-password |
45 | #StrictModes yes | 45 | #StrictModes yes |
46 | #MaxAuthTries 6 | 46 | #MaxAuthTries 6 |
47 | #MaxSessions 10 | 47 | #MaxSessions 10 |