ITS#6608 don't update mod opattrs on single-master slaves

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 101a5b6c90e26e499159d40a4ebc4402c196aeaf..2b9f25f68a23ba2e77276132e25ccc29254b08c2 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1165,6 +1165,9 @@ locked:
                        c.ldctl_iscritical = 1;
                        c.ldctl_oid = LDAP_CONTROL_RELAX;
                } else {
+                       /* If not forwarding, don't update opattrs */
+                       if ( SLAP_SINGLE_SHADOW( op->o_bd ))
+                               op2.orm_no_opattrs = 1;
                        op2.o_bd->bd_info = (BackendInfo *)on->on_info;
                }
                rc = op2.o_bd->be_modify( &op2, &r2 );