summaryrefslogtreecommitdiff
path: root/sshd_config
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2015-08-06 14:53:21 +0000
committerDamien Miller <djm@mindrot.org>2015-08-11 18:57:29 +1000
commit1dc8d93ce69d6565747eb44446ed117187621b26 (patch)
tree68e850b1c037c7d744836000527320d11b143168 /sshd_config
parent90a95a4745a531b62b81ce3b025e892bdc434de5 (diff)
downloadopenssh-git-1dc8d93ce69d6565747eb44446ed117187621b26.tar.gz
upstream commitV_7_0_P1V_7_0
add prohibit-password as a synonymn for without-password, since the without-password is causing too many questions. Harden it to ban all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from djm, ok markus Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a
Diffstat (limited to 'sshd_config')
-rw-r--r--sshd_config4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd_config b/sshd_config
index 46df1622..4d77f05a 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.96 2015/07/30 19:23:02 deraadt Exp $
+# $OpenBSD: sshd_config,v 1.97 2015/08/06 14:53:21 deraadt Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
@@ -41,7 +41,7 @@
# Authentication:
#LoginGraceTime 2m
-#PermitRootLogin without-password
+#PermitRootLogin prohibit-password
#StrictModes yes
#MaxAuthTries 6
#MaxSessions 10