From 7c07891caf91823c65d0ed7f700a1cfe983e15cc Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Wed, 22 Mar 2006 20:41:37 +0000
Subject: Merge conflicts.

---
 crypto/openssh/auth-krb5.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'crypto/openssh/auth-krb5.c')

diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c
index 7e5a614..133f1fc 100644
--- a/crypto/openssh/auth-krb5.c
+++ b/crypto/openssh/auth-krb5.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
+RCSID("$OpenBSD: auth-krb5.c,v 1.16 2005/11/21 09:42:10 dtucker Exp $");
 RCSID("$FreeBSD$");
 
 #include "ssh.h"
@@ -70,9 +70,6 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
 	krb5_ccache ccache = NULL;
 	int len;
 
-	if (!authctxt->valid)
-		return (0);
-
 	temporarily_use_uid(authctxt->pw);
 
 	problem = krb5_init(authctxt);
@@ -189,7 +186,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
 		else
 			return (0);
 	}
-	return (1);
+	return (authctxt->valid ? 1 : 0);
 }
 
 void
@@ -219,7 +216,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
 
 	ret = snprintf(ccname, sizeof(ccname),
 	    "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
-	if (ret == -1 || ret >= sizeof(ccname))
+	if (ret < 0 || (size_t)ret >= sizeof(ccname))
 		return ENOMEM;
 
 	old_umask = umask(0177);
-- 
cgit v1.1