resync with HEAD

servers/slapd/back-ldif/ldif.c

@@ -767,8 +767,7 @@ static int ldif_back_add(Operation *op, SlapReply *rs) {
 	int statres;
 	char textbuf[SLAP_TEXT_BUFLEN];
 
-	slap_add_opattrs( op, &rs->sr_text, textbuf, sizeof( textbuf ),
-		op->o_bd->be_pcl_mutexp != NULL ? 1 : 0 );
+	slap_add_opattrs( op, &rs->sr_text, textbuf, sizeof( textbuf ), 1 );
 
 	rs->sr_err = entry_schema_check(op, e, NULL, 0,
 		&rs->sr_text, textbuf, sizeof( textbuf ) );
@@ -831,8 +830,7 @@ static int ldif_back_modify(Operation *op, SlapReply *rs) {
 	int spew_res;
 
 	if ( !SLAP_SHADOW( op->o_bd ))
-		slap_mods_opattrs( op, op->orm_modlist,
-			op->o_bd->be_pcl_mutexp != NULL ? 1 : 0 );
+		slap_mods_opattrs( op, op->orm_modlist, 1 );
 
 	ldap_pvt_thread_mutex_lock(&ni->li_mutex);
 	dn2path(&op->o_req_ndn, &op->o_bd->be_nsuffix[0], &ni->li_base_path,