- millert@cvs.openbsd.org 2003/12/29 16:39:50

     [sshd_config]
     KeepAlive has been obsoleted, use TCPKeepAlive instead; markus@ OK

diff --git a/ChangeLog b/ChangeLog
index 9bbb5ac19654a7255b278e03c7a4883bcc1cbb68..dda5a97e7acaca9f673b6a4cf56d07c39ec2c144 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
    - jakob@cvs.openbsd.org 2003/12/23 16:12:10
      [servconf.c servconf.h session.c sshd_config]
      implement KerberosGetAFSToken server option. ok markus@, beck@
+   - millert@cvs.openbsd.org 2003/12/29 16:39:50
+     [sshd_config]
+     KeepAlive has been obsoleted, use TCPKeepAlive instead; markus@ OK
 
 20031219
  - (dtucker) [defines.h] Bug #458: Define SIZE_T_MAX as UINT_MAX if we

diff --git a/sshd_config b/sshd_config
index aaa30f4bab9609daca3c5d01b13c7f546b21cee8..b45c8c5616b84caf38b8ce882281fe7b0b6b2466 100644 (file)
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.67 2003/12/23 16:12:10 jakob Exp $
+#      $OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -79,7 +79,7 @@
 #X11UseLocalhost yes
 #PrintMotd yes
 #PrintLastLog yes
-#KeepAlive yes
+#TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no