From bca52e1b18e343a50e66059a76d1ea0781d377c3 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 5 Feb 2010 11:49:49 +0000 Subject: [PATCH] ITS#6469, don't touch op_attrs when updatedn is modifying contextCSN --- servers/slapd/back-bdb/modify.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 847208c841..84e9af87b2 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -422,7 +422,13 @@ txnReturn: ctrls[num_ctrls] = NULL; - slap_mods_opattrs( op, &op->orm_modlist, 1 ); + /* Don't touch the opattrs, if this is a contextCSN update + * initiated from updatedn */ + if ( !be_isupdate(op) || !op->orm_modlist || op->orm_modlist->sml_next || + op->orm_modlist->sml_desc != slap_schema.si_ad_contextCSN ) { + + slap_mods_opattrs( op, &op->orm_modlist, 1 ); + } if( 0 ) { retry: /* transaction retry */ -- 2.39.5