From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 12 Feb 2008 21:49:32 +0000 (+0000)
Subject: ITS#5370
X-Git-Tag: OPENLDAP_REL_ENG_2_3_41~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03055d0e2c63539b43a06da74a90ce7c1fa6e86a;p=thirdparty%2Fopenldap.git

ITS#5370
---

diff --git a/CHANGES b/CHANGES
index f608ccde8f..602790ec1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.41 Engineering
 	Fixed slapd idlcache on adds (ITS#5086)
+	Fixed slapd timestamp race condition (ITS#5370)
 	Fixed slapd-bdb modrdn to same dn (ITS#5319)
 	Fixed slapd-bdb crash with modrdn (ITS#5358) 
 	Fixed slapo-accesslog cleanup on successful response (ITS#5374)
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 75773e4ee1..9fd8d83f12 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -121,8 +121,8 @@ slap_op_free( Operation *op )
 void
 slap_op_time(time_t *t, int *nop)
 {
-	*t = slap_get_time();
 	ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+	*t = slap_get_time();
 	if ( *t == last_time ) {
 		*nop = ++last_incr;
 	} else {