diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-08-12 21:45:08 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-08-12 21:45:08 +0000 |
| commit | 18706e94cc8b2a2bc96e375401843536f3bf6f40 (patch) | |
| tree | dabd2a9556acf1ec5234d25f4e55c4cffc3efad1 | |
| parent | 27b8c74a7adfcefbec493d957ba798e232ecd404 (diff) | |
| download | krb5-18706e94cc8b2a2bc96e375401843536f3bf6f40.zip krb5-18706e94cc8b2a2bc96e375401843536f3bf6f40.tar.gz krb5-18706e94cc8b2a2bc96e375401843536f3bf6f40.tar.bz2 | |
pullup from trunk
ticket: 2643
version_fixed: 1.3.5
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16658 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kdc/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kdc/kerberos_v4.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 5114e6a..8711472 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,8 @@ +2004-07-23 Tom Yu <tlyu@mit.edu> + + * kerberos_v4.c (kerberos_v4): Duplicate backdating fix for + APPL_REQUEST as well. Fix comments. + 2004-03-22 Ken Raeburn <raeburn@mit.edu> * network.c (delete_fd): Free pointed-to data after removing it diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index 1d1ca70..d88590c 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -744,8 +744,7 @@ kerberos_v4(struct sockaddr_in *client, KTEXT pkt) v4endtime = krb_life_to_time(kerb_time.tv_sec, lifetime); /* * Adjust issue time backwards if necessary, due to - * roundup in krb_time_to_life(). XXX This frobs - * kerb_time, which is potentially problematic. + * roundup in krb_time_to_life(). */ if (v4endtime > v4req_end) request_backdate = v4endtime - v4req_end; @@ -819,6 +818,8 @@ kerberos_v4(struct sockaddr_in *client, KTEXT pkt) char *service; /* Service name */ char *instance; /* Service instance */ int kerno = 0; /* Kerberos error number */ + unsigned int request_backdate = 0; /*How far to backdate + in seconds.*/ char tktrlm[REALM_SZ]; n_appl_req++; @@ -938,11 +939,10 @@ kerberos_v4(struct sockaddr_in *client, KTEXT pkt) v4endtime = krb_life_to_time(kerb_time.tv_sec, lifetime); /* * Adjust issue time backwards if necessary, due to - * roundup in krb_time_to_life(). XXX This frobs - * kerb_time, which is potentially problematic. + * roundup in krb_time_to_life(). */ if (v4endtime > v4req_end) - kerb_time.tv_sec -= v4endtime - v4req_end; + request_backdate = v4endtime - v4req_end; /* unseal server's key from master key */ memcpy(key, &s_name_data.key_low, 4); @@ -963,7 +963,7 @@ kerberos_v4(struct sockaddr_in *client, KTEXT pkt) krb_create_ticket(tk, k_flags, ad->pname, ad->pinst, ad->prealm, client_host.s_addr, (char *) session_key, lifetime, - kerb_time.tv_sec, + kerb_time.tv_sec - request_backdate, s_name_data.name, s_name_data.instance, key); krb5_free_keyblock_contents(kdc_context, &k5key); |