summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:09:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:09:51 +0000
commitc4b7225b8ddbc4932d5d4a63183b911a9f2a1d73 (patch)
treeb48b252d700ce32af3a490eda8355198986533a0
parent3812ff5f415dc82800b922ed0f9e653eccef8142 (diff)
- markus@cvs.openbsd.org 2001/05/31 13:08:04
[sshd_config] group options and add some more comments
-rw-r--r--ChangeLog9
-rw-r--r--sshd_config49
2 files changed, 35 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index ace3d08d..01453414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,12 @@
history
- (bal) Channels.c and Channels.h -- "Merge Functions, simplify" (draged
out of ssh Attic)
- - (bal) Ooops.. nchan.c resync from OpenBSD ssh Attic.
+ - (bal) Ooops.. nchan.c (and remove nchan.h) resync from OpenBSD ssh
+ Attic.
+ - OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2001/05/31 13:08:04
+ [sshd_config]
+ group options and add some more comments
20010606
- OpenBSD CVS Sync
@@ -5526,4 +5531,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1252 2001/06/09 00:57:39 mouring Exp $
+$Id: ChangeLog,v 1.1253 2001/06/09 01:09:51 mouring Exp $
diff --git a/sshd_config b/sshd_config
index 90df340a..0e469300 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.39 2001/05/20 17:20:36 markus Exp $
+# $OpenBSD: sshd_config,v 1.40 2001/05/31 13:08:04 markus Exp $
# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
@@ -9,41 +9,43 @@ Port 22
#Protocol 2,1
#ListenAddress 0.0.0.0
#ListenAddress ::
+
+# HostKey for protocol version 1
HostKey /etc/ssh_host_key
+# HostKeys for protocol version 2
HostKey /etc/ssh_host_rsa_key
HostKey /etc/ssh_host_dsa_key
-ServerKeyBits 768
-LoginGraceTime 600
+
+# Lifetime and size of ephemeral version 1 server key
KeyRegenerationInterval 3600
-PermitRootLogin yes
-#
-# Don't read ~/.rhosts and ~/.shosts files
-IgnoreRhosts yes
-# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
-#IgnoreUserKnownHosts yes
-StrictModes yes
-X11Forwarding no
-X11DisplayOffset 10
-PrintMotd yes
-#PrintLastLog no
-KeepAlive yes
+ServerKeyBits 768
# Logging
SyslogFacility AUTH
LogLevel INFO
#obsoletes QuietMode and FascistLogging
+# Authentication:
+
+LoginGraceTime 600
+PermitRootLogin yes
+StrictModes yes
+
+RSAAuthentication yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile %h/.ssh/authorized_keys
+#AuthorizedKeysFile2 %h/.ssh/authorized_keys2
+
+# rhosts authentication should not be used
RhostsAuthentication no
-#
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
# For this to work you will also need host keys in /etc/ssh_known_hosts
RhostsRSAAuthentication no
# similar for protocol version 2
HostbasedAuthentication no
-#
-RSAAuthentication yes
-PubkeyAuthentication yes
-#AuthorizedKeysFile %h/.ssh/authorized_keys
-#AuthorizedKeysFile2 %h/.ssh/authorized_keys2
+# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
+#IgnoreUserKnownHosts yes
# To disable tunneled clear text passwords, change to no here!
PasswordAuthentication yes
@@ -65,6 +67,11 @@ PermitEmptyPasswords no
# Kerberos TGT Passing does only work with the AFS kaserver
#KerberosTgtPassing yes
+X11Forwarding no
+X11DisplayOffset 10
+PrintMotd yes
+#PrintLastLog no
+KeepAlive yes
#CheckMail yes
#UseLogin no