===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-krb5.c,v
retrieving revision 1.15
retrieving revision 1.15.8.2
diff -u -r1.15 -r1.15.8.2
--- src/usr.bin/ssh/auth-krb5.c	2003/11/21 11:57:02	1.15
+++ src/usr.bin/ssh/auth-krb5.c	2006/10/06 03:19:32	1.15.8.2
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth-krb5.c,v 1.15.8.2 2006/10/06 03:19:32 brad Exp $ */
 /*
  *    Kerberos v5 authentication and ticket-passing routines.
  *
@@ -27,16 +28,20 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
-RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
+#include <sys/types.h>
+#include <pwd.h>
+#include <stdarg.h>
 
+#include "xmalloc.h"
 #include "ssh.h"
 #include "ssh1.h"
 #include "packet.h"
-#include "xmalloc.h"
 #include "log.h"
+#include "buffer.h"
 #include "servconf.h"
 #include "uidswap.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
 
 #ifdef KRB5
@@ -65,9 +70,6 @@
 	krb5_error_code problem;
 	krb5_ccache ccache = NULL;
 
-	if (!authctxt->valid)
-		return (0);
-
 	temporarily_use_uid(authctxt->pw);
 
 	problem = krb5_init(authctxt);
@@ -134,7 +136,7 @@
 		else
 			return (0);
 	}
-	return (1);
+	return (authctxt->valid ? 1 : 0);
 }
 
 void