From 06e31e6376b362f24959d1f959ee24b3454fa009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 12 Nov 2008 04:18:50 +0000
Subject: [PATCH] handle krb5_cc_default_name() returning NULL in a diffrent
 way.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24029 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/fcache.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index 1a5d2d5ca..c78d51cce 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -822,17 +822,13 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id)
     iter->first = 0;
 
     fn = krb5_cc_default_name(context);
-    if (fn == NULL) {
-	krb5_clear_error_message(context);
-	return KRB5_CC_END;
-    }
-
-    if (strncasecmp(fn, "FILE:", 5) != 0) {
+    if (fn == NULL || strncasecmp(fn, "FILE:", 5) != 0) {
 	ret = _krb5_expand_default_cc_name(context,
 					   KRB5_DEFAULT_CCNAME_FILE,
 					   &expandedfn);
 	if (ret)
 	    return ret;
+	fn = expandedfn;
     }
     ret = krb5_cc_resolve(context, fn, id);
     if (expandedfn)