merged OpenSSH 5.2p1 to trunk

[gssapi-openssh.git] / openssh / compat.h

diff --git a/openssh/compat.h b/openssh/compat.h
index b982d3e8f945ef9cf96641659dcdd747e900a1c1..e303d3354139a25e5e4e452786f401959a9f7458 100644 (file)
--- a/openssh/compat.h
+++ b/openssh/compat.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: compat.h,v 1.34 2003/04/01 10:31:26 markus Exp $      */
+/* $OpenBSD: compat.h,v 1.42 2008/09/11 14:22:37 markus Exp $ */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -27,7 +27,7 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
-#define        SSH_PROTO_UNKNOWN       0x00
+#define        SSH_PROTO_UNKNOWN       0x00
 #define        SSH_PROTO_1             0x01
 #define        SSH_PROTO_1_PREFERRED   0x02
 #define        SSH_PROTO_2             0x04
@@ -53,12 +53,12 @@
 #define SSH_BUG_DERIVEKEY      0x00040000
 #define SSH_BUG_DUMMYCHAN      0x00100000
 #define SSH_BUG_EXTEOF         0x00200000
-#define SSH_BUG_K5USER         0x00400000
-#define SSH_BUG_PROBE          0x00800000
-#define SSH_BUG_FIRSTKEX       0x01000000
-#define SSH_OLD_GSSAPI         0x02000000
-#define SSH_BUG_GSSAPI_BER     0x04000000
-#define SSH_BUG_GSS_EMPTYUSER  0x10000000
+#define SSH_BUG_PROBE          0x00400000
+#define SSH_BUG_FIRSTKEX       0x00800000
+#define SSH_OLD_FORWARD_ADDR   0x01000000
+#define SSH_BUG_RFWD_ADDR      0x02000000
+#define SSH_NEW_OPENSSH                0x04000000
+#define SSH_BUG_LARGEWINDOW 0x08000000
 
 void     enable_compat13(void);
 void     enable_compat20(void);