ITS#4088 force cursors to use same locker

[openldap] / servers / slapd / sasl.c

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 645889ef85939f5d87ac2d98a91304c243ac6670..394c0a087130104e7061f95d9e95aee1f71a6356 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -374,7 +374,7 @@ slap_auxprop_lookup(
                                op.o_tag = LDAP_REQ_SEARCH;
                                op.o_ndn = conn->c_ndn;
                                op.o_callback = &cb;
-                               op.o_time = slap_get_time();
+                               slap_op_time( &op.o_time, &op.o_tincr );
                                op.o_do_not_cache = 1;
                                op.o_is_auth_check = 1;
                                op.o_req_dn = op.o_req_ndn;
@@ -460,7 +460,6 @@ slap_auxprop_store(
                BER_BVZERO( &mod->sml_values[j] );
                mod->sml_nvalues = NULL;
                mod->sml_desc = NULL;
-               mod->sml_managing = 0;
                *modtail = mod;
                modtail = &mod->sml_next;
        }
@@ -473,22 +472,17 @@ slap_auxprop_store(
                        &text, textbuf, textlen );
 
                if ( rc == LDAP_SUCCESS ) {
-                       rc = slap_mods_opattrs( &op, modlist, modtail,
-                                       &text, textbuf, textlen, 1 );
-
-                       if ( rc == LDAP_SUCCESS ) {
-                               op.o_hdr = conn->c_sasl_bindop->o_hdr;
-                               op.o_tag = LDAP_REQ_MODIFY;
-                               op.o_ndn = op.o_req_ndn;
-                               op.o_callback = &cb;
-                               op.o_time = slap_get_time();
-                               op.o_do_not_cache = 1;
-                               op.o_is_auth_check = 1;
-                               op.o_req_dn = op.o_req_ndn;
-                               op.orm_modlist = modlist;
-
-                               rc = op.o_bd->be_modify( &op, &rs );
-                       }
+                       op.o_hdr = conn->c_sasl_bindop->o_hdr;
+                       op.o_tag = LDAP_REQ_MODIFY;
+                       op.o_ndn = op.o_req_ndn;
+                       op.o_callback = &cb;
+                       slap_op_time( &op.o_time, &op.o_tincr );
+                       op.o_do_not_cache = 1;
+                       op.o_is_auth_check = 1;
+                       op.o_req_dn = op.o_req_ndn;
+                       op.orm_modlist = modlist;
+
+                       rc = op.o_bd->be_modify( &op, &rs );
                }
        }
        slap_mods_free( modlist, 1 );