1 files changed, 3 insertions, 6 deletions

diff --git a/auth-krb5.c b/auth-krb5.c
index 5f554a66b..bc37675a2 100644
--- a/auth-krb5.c
+++ b/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 $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -69,9 +69,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);
@@ -193,7 +190,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
                 else
                         return (0);
         }
-        return (1);
+        return (authctxt->valid ? 1 : 0);
 }
 
 void
@@ -229,7 +226,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
 
         ret = snprintf(ccname, sizeof(ccname),
             cctemplate, geteuid());
-        if (ret == -1 || ret >= (int) sizeof(ccname))
+        if (ret < 0 || (size_t)ret >= sizeof(ccname))
                 return ENOMEM;
 
 #ifndef USE_CCAPI