From 74ca4680dbc08093429897e82fc55b420814fc14 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 19 May 2007 14:12:24 +0000 Subject: [PATCH] more ITS#4973 initialization --- servers/slapd/modify.c | 2 ++ servers/slapd/overlays/syncprov.c | 3 ++- servers/slapd/syncrepl.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index 5b46c1a09f..bb0f32e02c 100644 --- 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 162635dfc2..64f87810f2 100644 --- 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 e68d7dabd7..e3f6891097 100644 --- 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 ) { -- 2.39.5