From: Howard Chu <hyc@openldap.org>
Date: Tue, 8 Sep 2020 20:25:30 +0000 (+0100)
Subject: ITS#9342 delta-sync: ignore error if deleting an already deleted entry
X-Git-Tag: OPENLDAP_REL_ENG_2_4_54~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a69fd1239215b3e75fb7d055b3a1657f970007b;p=thirdparty%2Fopenldap.git

ITS#9342 delta-sync: ignore error if deleting an already deleted entry
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 48eb6a8c23..a8b1e72cc8 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2654,6 +2654,9 @@ syncrepl_message_to_op(
 		Debug( rc ? LDAP_DEBUG_ANY : LDAP_DEBUG_SYNC,
 			"syncrepl_message_to_op: %s be_delete %s (%d)\n", 
 			si->si_ridtxt, op->o_req_dn.bv_val, rc );
+		/* silently ignore this */
+		if ( rc == LDAP_NO_SUCH_OBJECT )
+			rc = LDAP_SUCCESS;
 		do_graduate = 0;
 		break;
 	}