Apply ITS#294 y2k fix

diff --git a/CHANGES b/CHANGES
index 08b5e2853edb74a11660e13baf747958c877f74c..7b5f0118150734998ee6d0488719643872a0ca81 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP Change Log
 Changes included in OpenLDAP 1.2 Release Engineering
        CVS Tag: OPENLDAP_REL_ENG_1_2
        Fixed slapd lint
+       Fixed -lldap templates y2k bug (ITS#294)
 
 Changes included in OpenLDAP 1.2.7
        CVS Tag: OPENLDAP_REL_ENG_1_2_7

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index f40c343c52be4ebdb3b5e02a3bdf40a313180c82..d80b3774056e210edcbea9dbe5df71547e4c28be 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -900,8 +900,17 @@ time2text( char *ldtimestr, int dateonly )
                /* POSIX says tm_year should be year - 1900 */
        t.tm_year = 100 * GET2BYTENUM( p ) - 1900;
                p += 2;
+               t.tm_year += GET2BYTENUM( p ); p += 2;
+
+       } else {
+               /* came without a century */
+               t.tm_year = GET2BYTENUM( p ); p += 2;
+
+               /* Y2K hack - 2 digit years < 70 are 21st century */
+               if( t.tm_year < 70 ) {
+                       t.tm_year += 100;
+               }
        }
-    t.tm_year = GET2BYTENUM( p ); p += 2;
 
     t.tm_mon = GET2BYTENUM( p ) - 1; p += 2;
     t.tm_mday = GET2BYTENUM( p ); p += 2;