ITS#9823 Only request minCSN if accesslog is around

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index f6ab09949d0b093267de37a65016a8224fd97d36..5fc39bf17d700250a4f110b29c6dd24760a12904 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -3336,7 +3336,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;
@@ -3829,7 +3829,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 ) {