From 4a924643eb8c955c0fe9c5700850fc6ad29848a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 15 Dec 2006 21:35:52 +0000 Subject: [PATCH] (fcc_get_cache_next): avoid const warning. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19379 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/fcache.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c index e5e8c9780..ddd415d83 100644 --- a/lib/krb5/fcache.c +++ b/lib/krb5/fcache.c @@ -723,7 +723,8 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id) { struct fcache_iter *iter = cursor; krb5_error_code ret; - char *fn, *deffn; + const char *fn; + char *expandedfn = NULL; if (!iter->first) { krb5_clear_error_string(context); @@ -731,18 +732,17 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id) } iter->first = 0; - deffn = krb5_cc_default_name(context); - if (strncasecmp(deffn, "FILE:", 5) == 0) { - fn = deffn; - } else { + fn = krb5_cc_default_name(context); + if (strncasecmp(fn, "FILE:", 5) != 0) { ret = _krb5_expand_default_cc_name(context, - KRB5_DEFAULT_CCNAME_FILE, &fn); + KRB5_DEFAULT_CCNAME_FILE, + &expandedfn); if (ret) return ret; } ret = krb5_cc_resolve(context, fn, id); - if (fn != deffn) - free(fn); + if (expandedfn) + free(expandedfn); return ret; }