From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Fri, 6 Feb 2004 22:41:55 +0000 (+0000)
Subject: fix for ITS#2947
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~434
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7707a66d333ba887e10c03ab357fe7e8c4c70616;p=openldap

fix for ITS#2947
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index a77e2c6bcb..9953eee7a9 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1121,7 +1121,8 @@ syncrepl_entry(
 	case LDAP_SYNC_MODIFY:
 		if ( rc == LDAP_SUCCESS ||
 			 rc == LDAP_REFERRAL ||
-			 rc == LDAP_NO_SUCH_OBJECT )
+			 rc == LDAP_NO_SUCH_OBJECT ||
+			 rc == LDAP_NOT_ALLOWED_ON_NONLEAF )
 		{
 			attr_delete( &e->e_attrs, slap_schema.si_ad_entryUUID );
 			attr_merge_one( e, slap_schema.si_ad_entryUUID,
@@ -1134,7 +1135,7 @@ syncrepl_entry(
 			rc = be->be_add( op, &rs );
 
 			if ( rc != LDAP_SUCCESS ) {
-				if ( rc == LDAP_ALREADY_EXISTS ) {	
+				if ( rc == LDAP_ALREADY_EXISTS ) {
 					op->o_tag = LDAP_REQ_MODIFY;
 					op->orm_modlist = modlist;
 					op->o_req_dn = e->e_name;