X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmonitor.c;h=595095d86670f146ad9a61d6ebf5606010e8351b;hb=1c0b433a25744ff9f23e7c4322510f36692a7c77;hp=6a3403ea926f561092ce232791d6e5c5ee7e99af;hpb=68a473e6af085065d0e906d24b2e01ccc1b12e35;p=openldap

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 6a3403ea92..595095d866 100644
--- 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,10 +162,11 @@ monitor_info( Connection *conn, Operation *op )
 	attr_merge( e, "bytessent", vals );
 
 	pthread_mutex_lock( &currenttime_mutex );
-	ltm = localtime( &currenttime );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
+	ltm = gmtime( &currenttime );
 	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else
+	ltm = localtime( &currenttime );
 	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
 #endif
 	pthread_mutex_unlock( &currenttime_mutex );
@@ -174,10 +175,11 @@ monitor_info( Connection *conn, Operation *op )
 	attr_merge( e, "currenttime", vals );
 
 	pthread_mutex_lock( &currenttime_mutex );
-	ltm = localtime( &starttime );
-#ifdef LDAP_Y2K
+#ifndef LDAP_LOCALTIME
+	ltm = gmtime( &starttime );
 	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
 #else
+	ltm = localtime( &starttime );
 	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
 #endif
 	pthread_mutex_unlock( &currenttime_mutex );