more ITS#4973 initialization

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 5b46c1a09fee04fbb1b6ef68ceb91146cebf1bb7..bb0f32e02c33dacad1f0ec6a0ed7301ba36b8a7a 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -95,6 +95,8 @@ do_modify(
                goto cleanup;
        }
 
+       op->orm_no_opattrs = 0;
+
        rs->sr_err = slap_mods_check( op, op->orm_modlist,
                &rs->sr_text, textbuf, textlen, NULL );
 

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 162635dfc29065a2784b152476915d7c5b4087e4..64f87810f203f3f7728d6d1d896b9caeecbef533 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1284,7 +1284,7 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
 static void
 syncprov_checkpoint( Operation *op, SlapReply *rs, slap_overinst *on )
 {
-    syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
+       syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
        Modifications mod;
        Operation opm;
        SlapReply rsm = { 0 };
@@ -1312,6 +1312,7 @@ syncprov_checkpoint( Operation *op, SlapReply *rs, slap_overinst *on )
        if ( mod.sml_next != NULL ) {
                slap_mods_free( mod.sml_next, 1 );
        }
+       opm.orm_no_opattrs = 0;
 }
 
 static void

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index e68d7dabd7b3882ce828ba3f452038d6114b5c39..e3f68910975c9196583ae47c53705431bd0a64ac 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2134,6 +2134,7 @@ retry_add:;
 
                        rc = op->o_bd->be_modify( op, &rs_modify );
                        slap_mods_free( op->orm_modlist, 1 );
+                       op->orm_no_opattrs = 0;
                        Debug( LDAP_DEBUG_SYNC,
                                        "syncrepl_entry: %s be_modify (%d)\n", 
                                        si->si_ridtxt, rc, 0 );
@@ -2606,6 +2607,7 @@ syncrepl_updateCookie(
 
        op->orm_no_opattrs = 1;
        rc = op->o_bd->be_modify( op, &rs_modify );
+       op->orm_no_opattrs = 0;
        op->o_msgid = 0;
 
        if ( rs_modify.sr_err == LDAP_SUCCESS ) {