ITS#5370

diff --git a/CHANGES b/CHANGES
index f608ccde8f02b5b41f7424270a39ea046e445312..602790ec1d15e1542d443c7508867a05926697ef 100644 (file)
--- 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 75773e4ee1514a0d17611eddd4d95a3e43c7ea6d..9fd8d83f12048f9f863162488357f23aec6afab7 100644 (file)
--- 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 {