From 6bb49a160052d851e4df24ac0751d28d1f2dc448 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Wed, 31 Dec 2003 00:38:32 +0000
Subject: [PATCH]    - millert@cvs.openbsd.org 2003/12/29 16:39:50     
 [sshd_config]      KeepAlive has been obsoleted, use TCPKeepAlive instead;
 markus@ OK

---
 ChangeLog   | 3 +++
 sshd_config | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9bbb5ac1..dda5a97e 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
diff --git a/sshd_config b/sshd_config
index aaa30f4b..b45c8c56 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
-- 
2.45.2