From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 12 Feb 2008 21:48:44 +0000 (+0000)
Subject: ITS#5370
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0c3b4b9577ff5b49d495c40f2051c653b1fa42c;p=openldap

ITS#5370
---

diff --git a/CHANGES b/CHANGES
index 06fd570fb5..cb65735334 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ OpenLDAP 2.4.8 Engineering
 	Fixed slapd NULL printf (ITS#5264)	
 	Fixed slapd NULL set values (ITS#5286)
 	Fixed slapd segv with SASL/OTP (ITS#5259)
+	Fixed slapd timestamp race condition (ITS#5370)
 	Fixed slapd cn=config crash on delete (ITS#5343)
 	Fixed slapd cn=config global acls (ITS#5352)
 	Fixed slapd truncated cookie (ITS#5362)
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index e975eae28d..b3ec0372bc 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -129,8 +129,8 @@ slap_op_free( Operation *op, void *ctx )
 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 {