summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1998-07-02 22:36:50 +0000
committerTheodore Tso <tytso@mit.edu>1998-07-02 22:36:50 +0000
commit67a9928b569e3e13b5151d829b5af71dd2a538cc (patch)
tree101d78c05d2ad7f14238c9524031d74fff44cecc /src/lib/krb5
parent3c047f859f1c3868eeff3d8668fff01ef193cd08 (diff)
downloadkrb5-67a9928b569e3e13b5151d829b5af71dd2a538cc.tar.gz
krb5-67a9928b569e3e13b5151d829b5af71dd2a538cc.tar.xz
krb5-67a9928b569e3e13b5151d829b5af71dd2a538cc.zip
asn1_encode.c: Make the magic Macintosh EPOCH offset be 70 years
instead of 66 years, since CodeWarrior Pro 2 now bases everything off of 1900. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10619 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5')
-rw-r--r--src/lib/krb5/asn.1/ChangeLog6
-rw-r--r--src/lib/krb5/asn.1/asn1_encode.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index de87d7766..a42ad235c 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 2 15:30:25 1998 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * asn1_encode.c: Make the magic Macintosh EPOCH offset be 70 years
+ instead of 66 years, since CodeWarrior Pro 2 now bases
+ everything off of 1900.
+
Thu Apr 16 17:01:27 1998 Tom Yu <tlyu@mit.edu>
* asn1_encode.c (asn1_encode_generaltime): Sanity check the return
diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
index 826fc94af..aa8049e37 100644
--- a/src/lib/krb5/asn.1/asn1_encode.c
+++ b/src/lib/krb5/asn.1/asn1_encode.c
@@ -184,7 +184,7 @@ asn1_error_code asn1_encode_ia5string(buf, len, val, retlen)
}
#ifdef _MACINTOSH
-#define EPOCH ((66 * 365 * 24 * 60 * 60) + (17 * 24 * 60 * 60) + (getTimeZoneOffset() * 60 * 60))
+#define EPOCH ((70 * 365 * 24 * 60 * 60) + (17 * 24 * 60 * 60) + (getTimeZoneOffset() * 60 * 60))
#else
#define EPOCH (0)
#endif