From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Thu, 7 Jul 2022 20:31:03 +0000 (+0100)
Subject: ITS#9823 Only request minCSN if accesslog is around
X-Git-Tag: OPENLDAP_REL_ENG_2_5_13~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc812cdb8ad5a71ac613eb98a5e04b892d0de526;p=thirdparty%2Fopenldap.git

ITS#9823 Only request minCSN if accesslog is around
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index ec37c0bb3e..6d749a534d 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -3344,7 +3344,7 @@ no_change:	if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
 					numcsns, sids, &mincsn, minsid ) ) {
 				do_present = SS_PRESENT;
 			}
-		} else if ( si->si_nopres && si->si_usehint ) {
+		} else if ( ad_minCSN != NULL && si->si_nopres && si->si_usehint ) {
 			/* We are instructed to trust minCSN if it exists. */
 			Entry *e;
 			Attribute *a = NULL;
@@ -3837,7 +3837,10 @@ sp_cf_gen(ConfigArgs *c)
 		break;
 	case SP_USEHINT:
 		si->si_usehint = c->value_int;
-		rc = syncprov_setup_accesslog();
+		if ( si->si_usehint ) {
+			/* Consider we might be a delta provider, but it's ok if not */
+			(void)syncprov_setup_accesslog();
+		}
 		break;
 	case SP_LOGDB:
 		if ( si->si_logs ) {