===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/compat.c,v
retrieving revision 1.65.2.2
retrieving revision 1.66
diff -u -r1.65.2.2 -r1.66
--- src/usr.bin/ssh/compat.c	2003/09/16 21:20:25	1.65.2.2
+++ src/usr.bin/ssh/compat.c	2003/04/01 10:31:26	1.66
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.65.2.2 2003/09/16 21:20:25 brad Exp $");
+RCSID("$OpenBSD: compat.c,v 1.66 2003/04/01 10:31:26 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -79,11 +79,7 @@
 		{ "OpenSSH_2.5.3*",	SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
 		{ "OpenSSH_2.*,"
 		  "OpenSSH_3.0*,"
-		  "OpenSSH_3.1*",	SSH_BUG_EXTEOF|SSH_BUG_GSSAPI_BER},
-		{ "OpenSSH_3.2*,"
-		  "OpenSSH_3.3*,"
-		  "OpenSSH_3.4*,"
-		  "OpenSSH_3.5*",	SSH_BUG_GSSAPI_BER},
+		  "OpenSSH_3.1*",	SSH_BUG_EXTEOF},
 		{ "Sun_SSH_1.0*",	SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
 		{ "OpenSSH*",		0 },
 		{ "*MindTerm*",		0 },
@@ -135,9 +131,12 @@
 		  "1.2.19*,"
 		  "1.2.20*,"
 		  "1.2.21*,"
-		  "1.2.22*",		SSH_BUG_IGNOREMSG },
+		  "1.2.22*",		SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
 		{ "1.3.2*",		/* F-Secure */
-					SSH_BUG_IGNOREMSG },
+					SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
+		{ "1.2.1*,"
+		  "1.2.2*,"
+		  "1.2.3*",		SSH_BUG_K5USER },
 		{ "*SSH Compatible Server*",			/* Netscreen */
 					SSH_BUG_PASSWORDPAD },
 		{ "*OSU_0*,"
@@ -189,7 +188,7 @@
 			ret |= SSH_PROTO_2;
 			break;
 		default:
-			logit("ignoring bad proto spec: '%s'.", p);
+			log("ignoring bad proto spec: '%s'.", p);
 			break;
 		}
 	}