- 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 d325407..ad79ceb 100644
--- 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
@@ -1629,4 +1632,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3155 2003/12/31 00:37:34 dtucker Exp $
+$Id: ChangeLog,v 1.3156 2003/12/31 00:38:32 dtucker Exp $
diff --git a/sshd_config b/sshd_config
index aaa30f4..b45c8c5 100644
--- 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