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

krb5: Manually expand some macros in fcc_move()

Browse Source 
To help in debugging.
This commit is contained in:
Nicolas Williams
2022-01-25 17:22:23 -06:00
parent a4396ee819
commit 5cd49a8032
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/fcache.c
View File

@@ -1547,8 +1547,10 @@ static krb5_error_code KRB5_CALLCONV
fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to) fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
{ {
krb5_error_code ret = 0; krb5_error_code ret = 0;
krb5_fcache *f = FCACHE(from);
krb5_fcache *t = FCACHE(to);
if (TMPFILENAME(from)) { if (f->tmpfn) {
/* /*
* If `from' has a temp file and we haven't renamed it into place yet, * If `from' has a temp file and we haven't renamed it into place yet,
* then we should rename TMPFILENAME(from) to FILENAME(to). * then we should rename TMPFILENAME(from) to FILENAME(to).
@@ -1556,13 +1558,13 @@ fcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
* This can only happen if we're moving a ccache where only cc config * This can only happen if we're moving a ccache where only cc config
* entries, or no entries, have been written. That's not likely. * entries, or no entries, have been written. That's not likely.
*/ */
if (rk_rename(TMPFILENAME(from), FILENAME(to))) { if (rk_rename(f->tmpfn, t->filename)) {
ret = errno; ret = errno;
} else { } else {
free(TMPFILENAME(from)); free(f->tmpfn);
TMPFILENAME(from) = NULL; f->tmpfn = NULL;
} }
} else if ((ret = rk_rename(FILENAME(from), FILENAME(to)))) { } else if (rk_rename(f->filename, t->filename)) {
ret = errno; ret = errno;
} }
/* /*