summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-15 21:41:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-15 21:41:30 +0000
commit4288807bc049e5c8cb095ad5ad4661a9160fe73a (patch)
tree30da6fef28f557996aba65e5fba81f4b873fd9ee /usr.bin/ssh
parent9f876f06aee7d6acdc00f63e957b272f4423290b (diff)
2,1, not 1,2
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sshd.84
-rw-r--r--usr.bin/ssh/sshd_config4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 85dae6e0857..f2a529dd5ff 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -34,7 +34,7 @@
.\" (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.8,v 1.117 2001/04/15 21:05:49 stevesk Exp $
+.\" $OpenBSD: sshd.8,v 1.118 2001/04/15 21:41:29 deraadt Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -683,7 +683,7 @@ and
.Dq 2 .
Multiple versions must be comma-separated.
The default is
-.Dq 1,2 .
+.Dq 2,1 .
.It Cm PubkeyAuthentication
Specifies whether public key authentication is allowed.
The default is
diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config
index 103d574b83a..1b7c9d767b6 100644
--- a/usr.bin/ssh/sshd_config
+++ b/usr.bin/ssh/sshd_config
@@ -1,10 +1,10 @@
-# $OpenBSD: sshd_config,v 1.37 2001/04/15 21:05:49 stevesk Exp $
+# $OpenBSD: sshd_config,v 1.38 2001/04/15 21:41:29 deraadt Exp $
# This is the sshd server system-wide configuration file. See sshd(8)
# for more information.
Port 22
-#Protocol 2
+#Protocol 2,1
#ListenAddress 0.0.0.0
#ListenAddress ::
HostKey /etc/ssh_host_key