* 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

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 5fd1a422278f52f399b35f5f44b8c5259491ecde..48886a9aa12ffdb4a53da709a471d782480dd079 100644 (file)
--- 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 3f203d030d426591b7445dadf44929c5f25f33bc..06bf4bea5c36b47310beebd452fb93978692493f 100644 (file)
--- 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;