diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-09-02 22:12:07 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-09-02 22:12:07 +0000 |
| commit | 461f24521c2306c4db29a5ac8fb8fd5512625765 (patch) | |
| tree | 84f7934a5b9620e450cfcde02b1f5bf8a64b5c88 /src/lib | |
| parent | 303d8acad75fc6f3440876efa531f765416d89dd (diff) | |
Apply patch from Cesar Garcia to fix lifetime computation in 524
ticket conversion.
ticket: 1712
tags: pullup
version_reported: 1.3.1
target_version: 1.3.2
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15808 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/conv_creds.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 229336eaf..5d777909a 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2003-09-02 Tom Yu <tlyu@mit.edu> + + * conv_creds.c (krb524_convert_creds_plain): Apply patch from + Cesar Garcia to fix lifetime computation. + 2003-08-19 SamHartman <hartmans@avalanche-breakdown.mit.edu> * rd_cred.c (decrypt_credencdata): Don't double free credentials. diff --git a/src/lib/krb5/krb/conv_creds.c b/src/lib/krb5/krb/conv_creds.c index a4e5abc94..3a4e66dc5 100644 --- a/src/lib/krb5/krb/conv_creds.c +++ b/src/lib/krb5/krb/conv_creds.c @@ -130,7 +130,7 @@ krb524_convert_creds_plain(context, v5creds, v4creds) v4creds->issue_date = v5creds->times.starttime; v4creds->lifetime = krb5int_krb_time_to_life(v5creds->times.starttime, v5creds->times.endtime); - endtime = krb5int_krb_life_to_time(v5creds->times.starttime, + endtime = krb5int_krb_life_to_time(v4creds->issue_date, v4creds->lifetime); /* * Adjust start time backwards to deal with rounding up in |