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_5_0ALPHA~10^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bd2d1fee892a2cc8e32b502f1c5104fcaad6fee;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 f7f83cb775..154caa0a13 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3033,6 +3033,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;
 	}