From: Howard Chu <hyc@openldap.org>
Date: Mon, 31 Aug 2020 18:36:10 +0000 (+0100)
Subject: ITS#9282 fix crash in nonpresent_callback
X-Git-Tag: OPENLDAP_REL_ENG_2_4_53~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03eba9cd56e59ac1163452fc837fadbdc70de395;p=thirdparty%2Fopenldap.git

ITS#9282 fix crash in nonpresent_callback

In a standard Refresh present phase, the provider sends no cookie
since it is only listing the entries that existed as of the time
in the cookie the consumer sent. In this case the consumer only
needs to check entryCSNs against its last sent cookie.
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index bb9bb387a1..8ceb38f334 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -4613,6 +4613,9 @@ nonpresent_callback(
 		if ( present_uuid == NULL ) {
 			int covered = 1; /* covered by our new contextCSN? */
 
+			if ( !syncCookie )
+				syncCookie = &si->si_syncCookie;
+
 			/* TODO: This can go once we can build a filter that takes care of
 			 * the check for us */
 			a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN );