ITS#5370

diff --git a/CHANGES b/CHANGES
index 06fd570fb5797b299b3b523b6a5c3e2c5b5f7f75..cb6573533480283c96f5c24f62ceb2c4605171ec 100644 (file)
--- 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 e975eae28d3bb152ff88dfa684346601d1de08b3..b3ec0372bc4d389353227b4b128ddd22d5e66c01 100644 (file)
--- 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 {