ITS#5370

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)

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 {