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

kdc-req-body->till is optional.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2989 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-15 01:47:32 +00:00
parent d0596d6136
commit 61717cbfd4
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kdc/kerberos5.c
View File

@@ -354,9 +354,11 @@ as_rep(KDC_REQ *req,
kdc_log(2, "Postdated ticket requested -- %s", kdc_log(2, "Postdated ticket requested -- %s",
client_name); client_name);
} }
if(b->till == 0) if(b->till == NULL){
b->till = MAX_TIME; ALLOC(b->till);
t = b->till; *b->till = MAX_TIME;
}
t = *b->till;
if(client->max_life) if(client->max_life)
t = min(t, start + *client->max_life); t = min(t, start + *client->max_life);
if(server->max_life) if(server->max_life)
@@ -365,14 +367,14 @@ as_rep(KDC_REQ *req,
t = min(t, start + realm->max_life); t = min(t, start + realm->max_life);
#endif #endif
et.endtime = t; et.endtime = t;
if(f.renewable_ok && et.endtime < b->till){ if(f.renewable_ok && et.endtime < *b->till){
f.renewable = 1; f.renewable = 1;
if(b->rtime == NULL){ if(b->rtime == NULL){
ALLOC(b->rtime); ALLOC(b->rtime);
*b->rtime = 0; *b->rtime = 0;
} }
if(*b->rtime < b->till) if(*b->rtime < *b->till)
*b->rtime = b->till; *b->rtime = *b->till;
} }
if(f.renewable && b->rtime){ if(f.renewable && b->rtime){
t = *b->rtime; t = *b->rtime;
@@ -680,7 +682,11 @@ tgs_make_reply(KDC_REQ_BODY *b, EncTicketPart *tgt,
rep.msg_type = krb_tgs_rep; rep.msg_type = krb_tgs_rep;
et.authtime = tgt->authtime; et.authtime = tgt->authtime;
et.endtime = min(tgt->endtime, b->till); if(b->till == NULL){
ALLOC(b->till);
*b->till = MAX_TIME;
}
et.endtime = min(tgt->endtime, *b->till);
ALLOC(et.starttime); ALLOC(et.starttime);
*et.starttime = kdc_time; *et.starttime = kdc_time;
@@ -709,10 +715,10 @@ tgs_make_reply(KDC_REQ_BODY *b, EncTicketPart *tgt,
et.endtime = *et.starttime + life; et.endtime = *et.starttime + life;
} }
if(f.renewable_ok && tgt->flags.renewable && if(f.renewable_ok && tgt->flags.renewable &&
et.renew_till == NULL && et.endtime < b->till){ et.renew_till == NULL && et.endtime < *b->till){
et.flags.renewable = 1; et.flags.renewable = 1;
ALLOC(et.renew_till); ALLOC(et.renew_till);
*et.renew_till = b->till; *et.renew_till = *b->till;
} }
if(et.renew_till){ if(et.renew_till){
time_t renew; time_t renew;

5
lib/krb5/get_cred.c
View File

@@ -99,7 +99,10 @@ init_tgs_req (krb5_context context,
if (ret) if (ret)
goto fail; goto fail;
t->req_body.till = in_creds->times.endtime; if(in_creds->times.endtime){
ALLOC(t->req_body.till, 1);
*t->req_body.till = in_creds->times.endtime;
}
t->req_body.nonce = nonce; t->req_body.nonce = nonce;
if(second_ticket){ if(second_ticket){

5
lib/krb5/get_in_tkt.c
View File

@@ -368,7 +368,10 @@ init_as_req (krb5_context context,
} }
*a->req_body.from = creds->times.starttime; *a->req_body.from = creds->times.starttime;
} }
a->req_body.till = creds->times.endtime; if(creds->times.endtime){
ALLOC(a->req_body.till, 1);
*a->req_body.till = creds->times.endtime;
}
if(creds->times.renew_till){ if(creds->times.renew_till){
a->req_body.rtime = malloc(sizeof(*a->req_body.rtime)); a->req_body.rtime = malloc(sizeof(*a->req_body.rtime));
if (a->req_body.rtime == NULL) { if (a->req_body.rtime == NULL) {