slap_set_time() is no longer necessary.

[openldap] / servers / slapd / back-bdb2 / modify.c

diff --git a/servers/slapd/back-bdb2/modify.c b/servers/slapd/back-bdb2/modify.c
index 3178f66985e83c309c279bbc419891674b5b7d1c..ae5d3b208fa1ecd6233281035474ddf8081fc528 100644 (file)
--- a/servers/slapd/back-bdb2/modify.c
+++ b/servers/slapd/back-bdb2/modify.c
@@ -11,9 +11,6 @@
 #include "back-bdb2.h"
 #include "proto-back-bdb2.h"
 
-static int     add_values(Entry *e, LDAPMod *mod, char *dn);
-static int     delete_values(Entry *e, LDAPMod *mod, char *dn);
-static int     replace_values(Entry *e, LDAPMod *mod, char *dn);
 
 static int
 bdb2i_back_modify_internal(
@@ -28,7 +25,7 @@ bdb2i_back_modify_internal(
        char            *matched;
        LDAPModList     *ml;
        Entry           *e;
-       int             i, err;
+       int             err;
 
        Debug(LDAP_DEBUG_ARGS, "bdb2i_back_modify:\n", 0, 0, 0);
 
@@ -51,15 +48,15 @@ bdb2i_back_modify_internal(
 
                switch ( mod->mod_op & ~LDAP_MOD_BVALUES ) {
                case LDAP_MOD_ADD:
-                       err = add_values( e, mod, op->o_ndn );
+                       err = bdb2i_add_values( e, mod, op->o_ndn );
                        break;
 
                case LDAP_MOD_DELETE:
-                       err = delete_values( e, mod, op->o_ndn );
+                       err = bdb2i_delete_values( e, mod, op->o_ndn );
                        break;
 
                case LDAP_MOD_REPLACE:
-                       err = replace_values( e, mod, op->o_ndn );
+                       err = bdb2i_replace_values( e, mod, op->o_ndn );
                        break;
                }
 
@@ -131,7 +128,7 @@ bdb2_back_modify(
 
        bdb2i_start_timing( be->bd_info, &time1 );
 
-       if ( bdb2i_enter_backend_w( get_dbenv( be ), &lock ) != 0 ) {
+       if ( bdb2i_enter_backend_w( &lock ) != 0 ) {
 
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
                return( -1 );
@@ -144,20 +141,21 @@ bdb2_back_modify(
                case SLAP_SERVER_MODE:
                case SLAP_TIMEDSERVER_MODE:
                case SLAP_TOOL_MODE:
+               case SLAP_TOOLID_MODE:
                        bdb2i_check_default_attr_index_mod( li, modlist );
                        break;
        }
 
         ret = bdb2i_back_modify_internal( be, conn, op, dn, modlist );
-       (void) bdb2i_leave_backend_w( get_dbenv( be ), lock );
+       (void) bdb2i_leave_backend_w( lock );
        bdb2i_stop_timing( be->bd_info, time1, "MOD", conn, op );
 
        return( ret );
 }
 
 
-static int
-add_values(
+int
+bdb2i_add_values(
     Entry      *e,
     LDAPMod    *mod,
     char       *dn
@@ -184,8 +182,8 @@ add_values(
        return( LDAP_SUCCESS );
 }
 
-static int
-delete_values(
+int
+bdb2i_delete_values(
     Entry      *e,
     LDAPMod    *mod,
     char       *dn
@@ -240,8 +238,8 @@ delete_values(
        return( LDAP_SUCCESS );
 }
 
-static int
-replace_values(
+int
+bdb2i_replace_values(
     Entry      *e,
     LDAPMod    *mod,
     char       *dn