3 files changed, 11 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index b6cc55337..55b2975ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
      [sshconnect1.c sshd.c sshd_config sshd_config.5]
      remove kerberos support from ssh1, since it has been replaced with GSSAPI;
      but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...
+   - markus@cvs.openbsd.org 2003/08/29 10:03:15
+     [compat.c compat.h]
+     SSH_BUG_K5USER is unused; ok henning@
 
 20030829
  - (bal) openbsd-compat/ clean up.  Considate headers, add in Id on our
@@ -924,4 +927,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.2921 2003/09/02 12:51:17 djm Exp $
+$Id: ChangeLog,v 1.2922 2003/09/02 12:52:00 djm Exp $
diff --git a/compat.c b/compat.c
index 6bd42a6f5..af1d14321 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.68 2003/08/22 10:56:09 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.69 2003/08/29 10:03:15 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -135,12 +135,9 @@ compat_datafellows(const char *version)
                   "1.2.19*,"
                   "1.2.20*,"
                   "1.2.21*,"
-                  "1.2.22*",            SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
+                  "1.2.22*",            SSH_BUG_IGNOREMSG },
                 { "1.3.2*",             /* F-Secure */
-                                        SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
-                { "1.2.1*,"
-                  "1.2.2*,"
-                  "1.2.3*",             SSH_BUG_K5USER },
+                                        SSH_BUG_IGNOREMSG },
                 { "*SSH Compatible Server*",                    /* Netscreen */
                                         SSH_BUG_PASSWORDPAD },
                 { "*OSU_0*,"
diff --git a/compat.h b/compat.h
index a21e473c5..7a5004455 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: compat.h,v 1.35 2003/08/22 10:56:09 markus Exp $      */
+/*      $OpenBSD: compat.h,v 1.36 2003/08/29 10:03:15 markus Exp $      */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -53,10 +53,9 @@
 #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_BUG_GSSAPI_BER      0x02000000
+#define SSH_BUG_PROBE           0x00400000
+#define SSH_BUG_FIRSTKEX        0x00800000
+#define SSH_BUG_GSSAPI_BER      0x01000000
 
 void     enable_compat13(void);
 void     enable_compat20(void);