===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2.c,v
retrieving revision 1.95.2.2
retrieving revision 1.96
diff -u -r1.95.2.2 -r1.96
--- src/usr.bin/ssh/auth2.c	2003/09/16 21:20:24	1.95.2.2
+++ src/usr.bin/ssh/auth2.c	2003/02/06 21:22:43	1.96
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.95.2.2 2003/09/16 21:20:24 brad Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.96 2003/02/06 21:22:43 markus Exp $");
 
 #include "ssh2.h"
 #include "xmalloc.h"
@@ -36,14 +36,10 @@
 #include "pathnames.h"
 #include "monitor_wrap.h"
 
-#ifdef GSSAPI
-#include "ssh-gss.h"
-#endif
-
 /* import */
 extern ServerOptions options;
 extern u_char *session_id2;
-extern u_int session_id2_len;
+extern int session_id2_len;
 
 Authctxt *x_authctxt = NULL;
 
@@ -54,16 +50,10 @@
 extern Authmethod method_passwd;
 extern Authmethod method_kbdint;
 extern Authmethod method_hostbased;
-#ifdef GSSAPI
-extern Authmethod method_gssapi;
-#endif
 
 Authmethod *authmethods[] = {
 	&method_none,
 	&method_pubkey,
-#ifdef GSSAPI
-	&method_gssapi,
-#endif
 	&method_passwd,
 	&method_kbdint,
 	&method_hostbased,
@@ -163,8 +153,7 @@
 			authctxt->valid = 1;
 			debug2("input_userauth_request: setting up authctxt for %s", user);
 		} else {
-			logit("input_userauth_request: illegal user %s", user);
-			authctxt->pw = fakepw();
+			log("input_userauth_request: illegal user %s", user);
 		}
 		setproctitle("%s%s", authctxt->pw ? user : "unknown",
 		    use_privsep ? " [net]" : "");
@@ -181,12 +170,6 @@
 	}
 	/* reset state */
 	auth2_challenge_stop(authctxt);
-
-#ifdef GSSAPI
-	dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
-	dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL);
-#endif
-
 	authctxt->postponed = 0;
 
 	/* try to authenticate user */