ifdef Y2K -> ifndef LOCALTIME

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index ec233cd6a56a012e3dd7b0d3909f4b92578d7f1e..b05acd47fced9ccecb7e9156a910365299d66075 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -184,7 +184,7 @@ add_created_attrs( Operation *op, Entry *e )
        attr_merge( e, "creatorsname", bvals );
 
        pthread_mutex_lock( &currenttime_mutex );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
        ltm = gmtime( &currenttime );
        strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index ff6d4dd0470b9851c79544932ad82e0f9636b135..2629291563eeeee9966f43b9d7851fe16178a2cc 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -251,7 +251,7 @@ add_lastmods( Operation *op, LDAPMod **mods )
        *mods = tmp;
 
        pthread_mutex_lock( &currenttime_mutex );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
        ltm = gmtime( &currenttime );
        strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 8667bf2ca4456a92363ed24c414a7a5b2089e523..595095d86670f146ad9a61d6ebf5606010e8351b 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -93,7 +93,7 @@ monitor_info( Connection *conn, Operation *op )
                                nreadwaiters++;
                        }
                        pthread_mutex_lock( &currenttime_mutex );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
                        ltm = gmtime( &c[i].c_starttime );
                        strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
 #else
@@ -162,7 +162,7 @@ monitor_info( Connection *conn, Operation *op )
        attr_merge( e, "bytessent", vals );
 
        pthread_mutex_lock( &currenttime_mutex );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
        ltm = gmtime( &currenttime );
        strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else
@@ -175,7 +175,7 @@ monitor_info( Connection *conn, Operation *op )
        attr_merge( e, "currenttime", vals );
 
        pthread_mutex_lock( &currenttime_mutex );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
        ltm = gmtime( &starttime );
        strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else