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

always use _krb5_expand_path_tokens

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-05-27 12:31:23 -05:00
parent 886914f8f9
commit 44fd145d05
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/krb5/cache.c
View File

@@ -477,7 +477,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_cc_set_default_name(krb5_context context, const char *name) krb5_cc_set_default_name(krb5_context context, const char *name)
{ {
krb5_error_code ret = 0; krb5_error_code ret = 0;
char *p; char *p, *exp_p = NULL;
if (name == NULL) { if (name == NULL) {
const char *e = NULL; const char *e = NULL;
@@ -529,24 +529,15 @@ krb5_cc_set_default_name(krb5_context context, const char *name)
return ENOMEM; return ENOMEM;
} }
#ifdef KRB5_USE_PATH_TOKENS ret = _krb5_expand_path_tokens(context, p, &exp_p);
{ free(p);
char * exp_p = NULL; if (ret)
return ret;
if (_krb5_expand_path_tokens(context, p, &exp_p) == 0) {
free (p);
p = exp_p;
} else {
free (p);
return EINVAL;
}
}
#endif
if (context->default_cc_name) if (context->default_cc_name)
free(context->default_cc_name); free(context->default_cc_name);
context->default_cc_name = p; context->default_cc_name = exp_p;
return ret; return ret;
} }