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:25:47 -05:00
parent f9481967c7
commit 886914f8f9
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/krb5/fcache.c
View File

@@ -307,9 +307,10 @@ _krb5_erase_file(krb5_context context, const char *filename)
static krb5_error_code static krb5_error_code
fcc_gen_new(krb5_context context, krb5_ccache *id) fcc_gen_new(krb5_context context, krb5_ccache *id)
{ {
char *file, *exp_file = NULL;
krb5_error_code ret;
krb5_fcache *f; krb5_fcache *f;
int fd; int fd;
char *file;
f = malloc(sizeof(*f)); f = malloc(sizeof(*f));
if(f == NULL) { if(f == NULL) {
@@ -324,32 +325,23 @@ fcc_gen_new(krb5_context context, krb5_ccache *id)
N_("malloc: out of memory", "")); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
#ifdef KRB5_USE_PATH_TOKENS ret = _krb5_expand_path_tokens(context, file, &exp_file);
{ free(file);
char * exp_file = NULL; if (ret)
krb5_error_code ec; return ret;
ec = _krb5_expand_path_tokens(context, file, &exp_file); file = exp_file;
if (ec == 0) { fd = mkstemp(exp_file);
free(file);
file = exp_file;
} else {
free(file);
return ec;
}
}
#endif
fd = mkstemp(file);
if(fd < 0) { if(fd < 0) {
int ret = errno; int ret = errno;
krb5_set_error_message(context, ret, N_("mkstemp %s failed", ""), file); krb5_set_error_message(context, ret, N_("mkstemp %s failed", ""), exp_file);
free(f); free(f);
free(file); free(exp_file);
return ret; return ret;
} }
close(fd); close(fd);
f->filename = file; f->filename = exp_file;
f->version = 0; f->version = 0;
(*id)->data.data = f; (*id)->data.data = f;
(*id)->data.length = sizeof(*f); (*id)->data.length = sizeof(*f);