diff options
| author | Miro Jurisic <meeroh@mit.edu> | 2000-05-04 17:50:42 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 2000-05-04 17:50:42 +0000 |
| commit | c0fe992b425ff9a35cd2ad331d30411ead9b4757 (patch) | |
| tree | 46809ca1e16b49f134eb3ff98cc541fdbb002a8a /src/lib | |
| parent | 9337e76ff032df23f123725c09c1d155d93d300f (diff) | |
| download | krb5-c0fe992b425ff9a35cd2ad331d30411ead9b4757.tar.gz krb5-c0fe992b425ff9a35cd2ad331d30411ead9b4757.tar.xz krb5-c0fe992b425ff9a35cd2ad331d30411ead9b4757.zip | |
* stdcc_util.c (dupCCtoK5, dupK5toCC):
Conditionalized local/KDC time conversions for Mac-only
until we figure out what to do about that
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12220 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/ccache/ccapi/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccapi/stdcc_util.c | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index 5fd1a42227..48886a9aa1 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,9 @@ +2000-05-04 Miro Jurisic <meeroh@mit.edu> + + * stdcc_util.c (dupCCtoK5, dupK5toCC): + Conditionalized local/KDC time conversions for Mac-only + until we figure out what to do about that + 2000-04-18 Danilo Almeida <dalmeida@mit.edu> * winccld.h: Define CC_API_VER2 for all Windows code using ccapi. diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c index 3f203d030d..06bf4bea5c 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc_util.c +++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c @@ -196,7 +196,7 @@ int copyK5DataArrayToCC(krb5_creds *v5Creds, cc_creds *ccCreds, char whichArray) void dupCCtoK5(krb5_context context, cc_creds *src, krb5_creds *dest) { - krb5_int32 offset_seconds, offset_microseconds; + krb5_int32 offset_seconds = 0, offset_microseconds = 0; int err; /* @@ -214,8 +214,10 @@ void dupCCtoK5(krb5_context context, cc_creds *src, krb5_creds *dest) memcpy(dest->keyblock.contents, src->keyblock.data, dest->keyblock.length); /* copy times */ +#ifdef macintosh err = krb5_get_time_offsets(context, &offset_seconds, &offset_microseconds); if (err) return; +#endif dest->times.authtime = src->authtime + offset_seconds; dest->times.starttime = src->starttime + offset_seconds; dest->times.endtime = src->endtime + offset_seconds; @@ -252,7 +254,7 @@ void dupK5toCC(krb5_context context, krb5_creds *creds, cred_union **cu) { cc_creds *c; int err; - krb5_int32 offset_seconds, offset_microseconds; + krb5_int32 offset_seconds = 0, offset_microseconds = 0; #ifdef macintosh char *tempname = NULL; #endif @@ -307,8 +309,10 @@ void dupK5toCC(krb5_context context, krb5_creds *creds, cred_union **cu) c->keyblock.data = NULL; } +#ifdef macintosh err = krb5_get_time_offsets(context, &offset_seconds, &offset_microseconds); if (err) return; +#endif c->authtime = creds->times.authtime - offset_seconds; c->starttime = creds->times.starttime - offset_seconds; c->endtime = creds->times.endtime - offset_seconds; |