Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 1 insertions, 2 deletions

diff --git a/compat.h b/compat.h
index 7a5004455..efa0f081e 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: compat.h,v 1.36 2003/08/29 10:03:15 markus Exp $      */
+/*      $OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $      */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -55,7 +55,6 @@
 #define SSH_BUG_EXTEOF          0x00200000
 #define SSH_BUG_PROBE           0x00400000
 #define SSH_BUG_FIRSTKEX        0x00800000
-#define SSH_BUG_GSSAPI_BER      0x01000000
 
 void     enable_compat13(void);
 void     enable_compat20(void);