Don't assume that krb5_timestamp and time_t are the same type

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4450 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index d4883a35ebc37d9c91c3c306f598d71833c3af3c..9f1f3c6811e9f49c7d110a0c4339251a2308b337 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 16:13:45 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * asn1_decode_k.c (asn1_decode_kerberos_time): Don't assume that
+                 krb5_timestamp and time_t are the same.
+
 Thu Sep 29 14:26:34 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * asn1buf.c (asn1buf_remove_octetstring, asn1buf_remove_charstring): 

diff --git a/src/lib/krb5/asn.1/asn1_decode_k.c b/src/lib/krb5/asn.1/asn1_decode_k.c
index 322c6643134c546f6a67a23b75df4d998058274b..b4a928a5a3624d81c8a3599daf4eb22f300403c2 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_decode_k.c
+++ b/src/lib/krb5/asn.1/asn1_decode_k.c
@@ -115,7 +115,15 @@ asn1_error_code asn1_decode_kerberos_time(DECLARG(asn1buf *, buf),
      OLDDECLARG(asn1buf *, buf)
      OLDDECLARG(krb5_timestamp *, val)
 {
-  return asn1_decode_generaltime(buf,val);
+    time_t     t;
+    asn1_error_code retval;
+    
+    retval =  asn1_decode_generaltime(buf,&t);
+    if (retval)
+       return retval;
+
+    *val = t;
+    return 0;
 }
 
 #define integer_convert(fname,ktype)\