ITS#5640

diff --git a/CHANGES b/CHANGES
index 32d03680e72ceef948954e541fca0abe7ee9144d..73b2eedf16134e4e9f25aaeb1f9748faf7ad8ea2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ OpenLDAP 2.4.13 Engineering
        Added slapd PMI schema (ITS#5695)
        Added slapd private databases in global overlays (ITS#5735,ITS#5736)
        Fixed slapd slapd.conf validation to LDIF (ITS#5755)
+       Fixed slapd startup scan for CSN (ITS#5640)
        Fixed slapd statslog printing of released entry (ITS#5775)
        Added slapd support for certificateListExactMatch (ITS#5700)
        Fixed slapd syncrepl MOD of attrs with no EQ rule (ITS#5781)

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 20b5fe9a66e8bf1b9c035915de37178ed652ec49..5de029303bc6cb0984a1c4bac16f876535db9271 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -168,6 +168,8 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
                        be->be_suffix[0].bv_val, 0, 0 );
                return -1;
        }
+       if ( rc == ALOCK_CLEAN )
+               be->be_flags |= SLAP_DBFLAG_CLEAN;
 
        /*
         * The DB_CONFIG file may have changed. If so, recover the

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index a7cf44b74b57d23653fb526ff0cd19a6ca7bd229..ab0ef885a84b6899869db46080f9a186343ccf01 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2733,7 +2733,7 @@ syncprov_db_open(
                        si->si_sids = slap_parse_csn_sids( si->si_ctxcsn, a->a_numvals, NULL );
                }
                overlay_entry_release_ov( op, e, 0, on );
-               if ( si->si_ctxcsn ) {
+               if ( si->si_ctxcsn && !SLAP_DBCLEAN( be )) {
                        op->o_req_dn = be->be_suffix[0];
                        op->o_req_ndn = be->be_nsuffix[0];
                        op->ors_scope = LDAP_SCOPE_SUBTREE;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d0d7c4e6d56fbfb1105ef36bb231138c4f0a0668..08bf0e12bc48618e0ecce8bcb1e6f16f66f7e1a0 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1790,6 +1790,7 @@ struct BackendDB {
 #define SLAP_DBFLAG_SINGLE_SHADOW      0x4000U /* a single-master shadow */
 #define SLAP_DBFLAG_SYNC_SHADOW                0x1000U /* a sync shadow */
 #define SLAP_DBFLAG_SLURP_SHADOW       0x2000U /* a slurp shadow */
+#define SLAP_DBFLAG_CLEAN              0x10000U /* was cleanly shutdown */
        slap_mask_t     be_flags;
 #define SLAP_DBFLAGS(be)                       ((be)->be_flags)
 #define SLAP_NOLASTMOD(be)                     (SLAP_DBFLAGS(be) & SLAP_DBFLAG_NOLASTMOD)
@@ -1814,6 +1815,7 @@ struct BackendDB {
 #define SLAP_SLURP_SHADOW(be)                  (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SLURP_SHADOW)
 #define SLAP_SINGLE_SHADOW(be)                 (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SINGLE_SHADOW)
 #define SLAP_MULTIMASTER(be)                   (!SLAP_SINGLE_SHADOW(be))
+#define SLAP_DBCLEAN(be)                       (SLAP_DBFLAGS(be) & SLAP_DBFLAG_CLEAN)
 
        slap_mask_t     be_restrictops;         /* restriction operations */
 #define SLAP_RESTRICT_OP_ADD           0x0001U