very bad typo.

[openldap] / servers / slapd / monitor.c

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 07ead7445d85224b1d2a07029601958aa3ca3703..595095d86670f146ad9a61d6ebf5606010e8351b 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -49,7 +49,7 @@ void
 monitor_info( Connection *conn, Operation *op )
 {
        Entry           *e;
-       char            buf[BUFSIZ], buf2[20];
+       char            buf[BUFSIZ], buf2[22];
        struct berval   val;
        struct berval   *vals[2];
        int             i, nconns, nwritewaiters, nreadwaiters;
@@ -60,6 +60,8 @@ monitor_info( Connection *conn, Operation *op )
        vals[1] = NULL;
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+       /* initialize reader/writer lock */
+       entry_rdwr_init(e);
        e->e_attrs = NULL;
        e->e_dn = strdup( SLAPD_MONITOR_DN );
 
@@ -91,8 +93,13 @@ monitor_info( Connection *conn, Operation *op )
                                nreadwaiters++;
                        }
                        pthread_mutex_lock( &currenttime_mutex );
+#ifndef LDAP_LOCALTIME
+                       ltm = gmtime( &c[i].c_starttime );
+                       strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
+#else
                        ltm = localtime( &c[i].c_starttime );
                        strftime( buf2, sizeof(buf2), "%y%m%d%H%M%SZ", ltm );
+#endif
                        pthread_mutex_unlock( &currenttime_mutex );
 
                        pthread_mutex_lock( &c[i].c_dnmutex );
@@ -155,16 +162,26 @@ monitor_info( Connection *conn, Operation *op )
        attr_merge( e, "bytessent", vals );
 
        pthread_mutex_lock( &currenttime_mutex );
-        ltm = localtime( &currenttime );
-        strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+#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 );
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "currenttime", vals );
 
        pthread_mutex_lock( &currenttime_mutex );
-        ltm = localtime( &starttime );
-        strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+#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 );
        val.bv_val = buf;
        val.bv_len = strlen( buf );