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

Fix cred handle lifetime/expiration confusion

Browse Source 
In at least two instances the krb5 cred handle expiration time was misused
as a remaining lifetime.  This is not surprising since the field name is
wrong ("lifetime" not "expiration").  This commit fixes the code, the next
commit will rename the field and change its type from OM_uint32 to time_t.
This commit is contained in:
Viktor Dukhovni
2015-04-13 18:39:14 -05:00
committed by Nicolas Williams
parent 9a515026b9
commit 3bb33fa6e8
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/gssapi/krb5/copy_ccache.c
View File

@@ -89,6 +89,8 @@ _gsskrb5_krb5_import_cred(OM_uint32 *minor_status,
handle->usage = 0;
if (id) {
time_t now;
OM_uint32 left;
char *str;
handle->usage |= GSS_C_INITIATE;
@@ -116,17 +118,22 @@ _gsskrb5_krb5_import_cred(OM_uint32 *minor_status,
}
}
krb5_timeofday(context, &now);
ret = __gsskrb5_ccache_lifetime(minor_status,
context,
id,
handle->principal,
&handle->lifetime);
&left);
if (ret != GSS_S_COMPLETE) {
krb5_free_principal(context, handle->principal);
free(handle);
return ret;
}
/*
* XXX: This is a stored value, hence an absolute time, and the field
* name is misleading.
*/
handle->lifetime = now + left;
kret = krb5_cc_get_full_name(context, id, &str);
if (kret)