From 1f94f45c3af676d0f1bb3d853a98a5a22359983c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Sun, 12 Dec 2010 01:49:53 +0000 Subject: [PATCH] ITS#6608 --- CHANGES | 1 + servers/slapd/overlays/ppolicy.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 7d93d96f49..bb73a10dcb 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,7 @@ OpenLDAP 2.4.24 Engineering Fixed liblber to not close invalid sockets (ITS#6585) Fixed slapd modify to return actual error (ITS#6581) Fixed slapd-bdb entry cache delete failure (ITS#6577) + Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608) Fixed slapo-syncprov to send error if consumer is newer (ITS#6606) OpenLDAP 2.4.23 Release (2010/06/30) diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index 3ca4237793..f34c442019 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -1161,6 +1161,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 ); -- 2.39.5