oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(fcc_get_cache_next): avoid const warning.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19379 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-15 21:35:52 +00:00
parent be40e72015
commit 4a924643eb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5/fcache.c
View File

@@ -723,7 +723,8 @@ fcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id)
{ {
struct fcache_iter *iter = cursor; struct fcache_iter *iter = cursor;
krb5_error_code ret; krb5_error_code ret;
char *fn, *deffn; const char *fn;
char *expandedfn = NULL;
if (!iter->first) { if (!iter->first) {
krb5_clear_error_string(context); 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; iter->first = 0;
deffn = krb5_cc_default_name(context); fn = krb5_cc_default_name(context);
if (strncasecmp(deffn, "FILE:", 5) == 0) { if (strncasecmp(fn, "FILE:", 5) != 0) {
fn = deffn;
} else {
ret = _krb5_expand_default_cc_name(context, ret = _krb5_expand_default_cc_name(context,
KRB5_DEFAULT_CCNAME_FILE, &fn); KRB5_DEFAULT_CCNAME_FILE,
&expandedfn);
if (ret) if (ret)
return ret; return ret;
} }
ret = krb5_cc_resolve(context, fn, id); ret = krb5_cc_resolve(context, fn, id);
if (fn != deffn) if (expandedfn)
free(fn); free(expandedfn);
return ret; return ret;
} }