fix Release configuration

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index fcc040a18ec9af22c206fdf4d5acd72402f33cc1..c3b5fc9cc84629c5d1f6961ddbb5bd2a8f45c56f 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -152,7 +152,7 @@ do_modify(
         * 2) this backend is master for what it holds;
         * 3) it's a replica and the dn supplied is the update_ndn.
         */
-       if ( be->be_modify != NULL ) {
+       if ( be->be_modify ) {
                /* do the update here */
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
@@ -206,6 +206,7 @@ add_lastmods( Operation *op, LDAPModList **modlist )
        LDAPModList             **m;
        LDAPModList             *tmp;
        struct tm       *ltm;
+       time_t          currenttime;
 
        Debug( LDAP_DEBUG_TRACE, "add_lastmods\n", 0, 0, 0 );
 
@@ -244,13 +245,13 @@ add_lastmods( Operation *op, LDAPModList **modlist )
        tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
        tmp->ml_type = ch_strdup( "modifiersname" );
        tmp->ml_op = LDAP_MOD_REPLACE;
-       tmp->ml_bvalues = (struct berval **) ch_calloc( 1,
-           2 * sizeof(struct berval *) );
+       tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
        tmp->ml_bvalues[0] = ber_bvdup( &bv );
        tmp->ml_next = *modlist;
        *modlist = tmp;
 
-       pthread_mutex_lock( &currenttime_mutex );
+       currenttime = slap_get_time();
+       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
 #ifndef LDAP_LOCALTIME
        ltm = gmtime( &currenttime );
        strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
@@ -258,13 +259,14 @@ add_lastmods( Operation *op, LDAPModList **modlist )
        ltm = localtime( &currenttime );
        strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
 #endif
-       pthread_mutex_unlock( &currenttime_mutex );
+       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+
        bv.bv_val = buf;
        bv.bv_len = strlen( bv.bv_val );
        tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
        tmp->ml_type = ch_strdup( "modifytimestamp" );
        tmp->ml_op = LDAP_MOD_REPLACE;
-       tmp->ml_bvalues = (struct berval **) ch_calloc( 1, 2 * sizeof(struct berval *) );
+       tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
        tmp->ml_bvalues[0] = ber_bvdup( &bv );
        tmp->ml_next = *modlist;
        *modlist = tmp;