ITS#7040 don't complain about other server's CSNs

[openldap] / servers / slapd / overlays / memberof.c

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 531ff290d9ed4468c1b5d5ae80fd91fa49643e22..502cb46fc1bd4f8037fe32dd158d21b4437bf918 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -357,6 +357,10 @@ memberof_value_modify(
        op2.o_ndn = op->o_bd->be_rootndn;
        op2.orm_modlist = NULL;
 
+       /* Internal ops, never replicate these */
+       op2.orm_no_opattrs = 1;
+       op2.o_dont_replicate = 1;
+
        if ( !BER_BVISNULL( &mo->mo_ndn ) ) {
                ml = &mod[ mcnt ];
                ml->sml_numvals = 1;
@@ -387,7 +391,6 @@ memberof_value_modify(
        ml->sml_flags = SLAP_MOD_INTERNAL;
        ml->sml_next = op2.orm_modlist;
        op2.orm_modlist = ml;
-       op2.orm_no_opattrs = 0;
 
        if ( new_ndn != NULL ) {
                BackendInfo *bi = op2.o_bd->bd_info;
@@ -404,7 +407,6 @@ memberof_value_modify(
 
                oex.oe_key = (void *)&memberof;
                LDAP_SLIST_INSERT_HEAD(&op2.o_extra, &oex, oe_next);
-               BER_BVZERO( &op2.o_csn );
                op2.o_bd->bd_info = (BackendInfo *)on->on_info;
                (void)op->o_bd->be_modify( &op2, &rs2 );
                op2.o_bd->bd_info = bi;
@@ -447,7 +449,6 @@ memberof_value_modify(
 
                oex.oe_key = (void *)&memberof;
                LDAP_SLIST_INSERT_HEAD(&op2.o_extra, &oex, oe_next);
-               BER_BVZERO( &op2.o_csn );
                op2.o_bd->bd_info = (BackendInfo *)on->on_info;
                (void)op->o_bd->be_modify( &op2, &rs2 );
                op2.o_bd->bd_info = bi;
@@ -1243,8 +1244,6 @@ memberof_res_add( Operation *op, SlapReply *rs )
 
                ma = attr_find( op->ora_e->e_attrs, mo->mo_ad_memberof );
                if ( ma != NULL ) {
-                       char relax = op->o_relax;
-
                        /* relax is required to allow to add
                         * a non-existing member */
                        op->o_relax = SLAP_CONTROL_CRITICAL;