[389-commits] ldap/servers

ldap/servers/slapd/back-ldbm/ldbm_modify.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 016f0f9403a9492fc55c1c080afef9a9bf944f31
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Tue Apr 19 15:54:03 2016 -0700

Ticket #48799 - objectclass values could be dropped on the consumer

Description: slapi_schema_expand_objectclasses was dropped if the modify
operation is replicated in the fix of Ticket 17 "new replication optimizations".

Since the replicated mods does not contain the expanded objectclasses,
slapi_schema_expand_objectclasses is needed on the consumer, too.

This patch resurrects the call for the consumer.

https://fedorahosted.org/389/ticket/48799

Author: nhosoi

Review: wibrown

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 83b7b55..fecd3b8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -273,7 +273,7 @@ modify_apply_check_expand(
* If the objectClass attribute type was modified in any way, expand
* the objectClass values to reflect the inheritance hierarchy.
*/
- for ( i = 0; (mods != NULL) && (mods[i] != NULL) && !repl_op; ++i ) {
+ for ( i = 0; mods && mods[i]; ++i ) {
if ( 0 == strcasecmp( SLAPI_ATTR_OBJECTCLASS, mods[i]->mod_type )) {
slapi_schema_expand_objectclasses( ec->ep_entry );
break;

--
389-commits mailing list
389-commits@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/389-commits@lists.fedoraproject.org