Cleanup

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 2710ffe79969d1491d9aec60b0311fed60495063..69ce10283173f629aced19269de813f3ce5ad523 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -690,7 +690,7 @@ slap_sort_vals(
 #define        SWAP(a,b,tmp)   tmp=(a);(a)=(b);(b)=tmp
 #define        COMP(a,b)       match=0; rc = ordered_value_match( &match, \
                                                ad, mr, SLAP_MR_EQUALITY \
-                                                               | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX \
+                                                               | SLAP_MR_VALUE_OF_ASSERTION_SYNTAX \
                                                                | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH \
                                                                | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH, \
                                                                &(a), &(b), text );
@@ -848,21 +848,11 @@ slap_sort_vals(
  */
 void slap_timestamp( time_t *tm, struct berval *bv )
 {
-       struct tm *ltm;
-#ifdef HAVE_GMTIME_R
-       struct tm ltm_buf;
-
-       ltm = gmtime_r( tm, &ltm_buf );
-#else
-       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-       ltm = gmtime( tm );
-#endif
+       struct tm ltm;
 
-       bv->bv_len = lutil_gentime( bv->bv_val, bv->bv_len, ltm );
+       ldap_pvt_gmtime( tm, &ltm );
 
-#ifndef HAVE_GMTIME_R
-       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-#endif
+       bv->bv_len = lutil_gentime( bv->bv_val, bv->bv_len, &ltm );
 }
 
 /* Called for all modify and modrdn ops. If the current op was replicated
@@ -876,7 +866,7 @@ void slap_mods_opattrs(
        struct berval name, timestamp, csn = BER_BVNULL;
        struct berval nname;
        char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
-       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
+       char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
        Modifications *mod, **modtail, *modlast;
        int gotcsn = 0, gotmname = 0, gotmtime = 0;