diff options
author | Sam Hartman <hartmans@mit.edu> | 2003-06-06 19:30:40 +0000 |
---|---|---|
committer | Sam Hartman <hartmans@mit.edu> | 2003-06-06 19:30:40 +0000 |
commit | c9038861a1610a78c6800ea15253f2e991d15091 (patch) | |
tree | 6d556770b1140c510deac6f981e9a4047d44cd82 /src | |
parent | 77df9e16742508c9f0c2ad08a6f70faa07dd22ce (diff) | |
download | krb5-c9038861a1610a78c6800ea15253f2e991d15091.zip krb5-c9038861a1610a78c6800ea15253f2e991d15091.tar.gz krb5-c9038861a1610a78c6800ea15253f2e991d15091.tar.bz2 |
Don't allow renewable_ok to be set if the renew liftime is greater
than the ticket lifetime.
Ticket: 1576
Tags: pullup
Status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15590 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
-rw-r--r-- | src/lib/krb5/krb/get_in_tkt.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index c554cea..a0106c0 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2003-06-06 Sam Hartman <hartmans@mit.edu> + + * get_in_tkt.c (krb5_get_init_creds): Mask out renewable_ok if the + request is for a renewable ticket with rtime greater than till + 2003-06-06 Ezra Peisach <epeisach@mit.edu> * mk_req_ext.c (krb5_generate_authenticator): Sequence numbers are diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 2f6c257..df5ebaf 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -877,6 +877,8 @@ krb5_get_init_creds(krb5_context context, if (renew_life > 0) { request.rtime = request.from; request.rtime += renew_life; + if (request.rtime >= request.till) + request.kdc_options &= ~(KDC_OPT_RENEWABLE_OK); } else { request.rtime = 0; } |