From: Howard Chu <hyc@openldap.org>
Date: Wed, 28 Jul 2010 02:43:21 +0000 (+0000)
Subject: ITS#6608 don't update mod opattrs on single-master slaves
X-Git-Tag: MIGRATION_CVS2GIT~538
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9434a7d6765ee3a5518b034df56d66c551a230ef;p=openldap

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 101a5b6c90..2b9f25f68a 100644
--- 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 );