X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fconn.c;h=c59e9e566a0152366ac79f119a88458001b32a3c;hb=d9edc7d5afd2860fac2fa0121044db28d94c9f7f;hp=d962a9fe4cd5be0de87998db4cbcb175908a61ec;hpb=fb6dfb852d558b2fd775050079569758b61a066c;p=openldap

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index d962a9fe4c..c59e9e566a 100644
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2009 The OpenLDAP Foundation.
+ * Copyright 2001-2011 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -266,72 +266,27 @@ conn_create(
 	monitor_subsys_t	*ms )
 {
 	monitor_entry_t *mp;
-	struct tm	*tm;
+	struct tm	tm;
 	char		buf[ BACKMONITOR_BUFSIZE ];
 	char		buf2[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 	char		buf3[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
-	struct berval bv, ctmbv, mtmbv, bv2, bv3;
+	struct berval bv, ctmbv, mtmbv;
 	struct berval bv_unknown= BER_BVC("unknown");
 
 	Entry		*e;
 
-#ifdef HACK_LOCAL_TIME
-	char		ctmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-	char		mtmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-#endif
-#ifdef HAVE_GMTIME_R
-	struct tm	tm_buf;
-#endif /* HAVE_GMTIME_R */
-
 	assert( c != NULL );
 	assert( ep != NULL );
 
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#endif
-
-#ifdef HAVE_GMTIME_R
-	tm = gmtime_r( &c->c_starttime, &tm_buf );
-#else
-	tm = gmtime( &c->c_starttime );
-#endif
-	bv2.bv_len = lutil_gentime( buf2, sizeof( buf2 ), tm );
-	bv2.bv_val = buf2;
-#ifdef HACK_LOCAL_TIME
-# ifdef HAVE_LOCALTIME_R
-	tm = localtime_r( &c->c_starttime, &tm_buf );
-# else
-	tm = localtime( &c->c_starttime );
-# endif
-	ctmbv.bv_len = lutil_localtime( ctmbuf, sizeof( ctmbuf ), tm, -timezone );
-	ctmbv.bv_val = ctmbuf;
-#else /* !HACK_LOCAL_TIME */
-	ctmbv = bv2;
-#endif
-
-#ifdef HAVE_GMTIME_R
-	tm = gmtime_r( &c->c_activitytime, &tm_buf );
-#else
-	tm = gmtime( &c->c_activitytime );
-#endif
-	bv3.bv_len = lutil_gentime( buf3, sizeof( buf3 ), tm );
-	bv3.bv_val = buf3;
-#ifdef HACK_LOCAL_TIME
-# ifdef HAVE_LOCALTIME_R
-	tm = localtime_r( &c->c_activitytime, &tm_buf );
-# else
-	tm = localtime( &c->c_activitytime );
-# endif /* HAVE_LOCALTIME_R */
-	mtmbv.bv_len = lutil_localtime( mtmbuf, sizeof( mtmbuf ), tm, -timezone );
-	mtmbv.bv_val = mtmbuf;
-#else /* !HACK_LOCAL_TIME */
-	mtmbv = bv3;
-#endif
-
-#ifndef HAVE_GMTIME_R
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-#endif
+	ldap_pvt_gmtime( &c->c_starttime, &tm );
+
+	ctmbv.bv_len = lutil_gentime( buf2, sizeof( buf2 ), &tm );
+	ctmbv.bv_val = buf2;
+
+	ldap_pvt_gmtime( &c->c_activitytime, &tm );
+	mtmbv.bv_len = lutil_gentime( buf3, sizeof( buf3 ), &tm );
+	mtmbv.bv_val = buf3;
 
 	bv.bv_len = snprintf( buf, sizeof( buf ),
 		"cn=Connection %ld", c->c_connid );
@@ -450,9 +405,9 @@ conn_create(
 	attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionLocalAddress,
 		&c->c_sock_name, NULL );
 
-	attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionStartTime, &bv2, NULL );
+	attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionStartTime, &ctmbv, NULL );
 
-	attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionActivityTime, &bv3, NULL );
+	attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionActivityTime, &mtmbv, NULL );
 
 	mp = monitor_entrypriv_create();
 	if ( mp == NULL ) {