add shadow mask

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 4faacb00763b22541161d2403eac70e59b1efcf8..dadd88d5c92db7cc444587eeb1c056e5d29f7468 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1798,6 +1798,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_SHADOW_MASK                (SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SINGLE_SHADOW|SLAP_DBFLAG_SYNC_SHADOW|SLAP_DBFLAG_SLURP_SHADOW)
 #define SLAP_DBFLAG_CLEAN              0x10000U /* was cleanly shutdown */
 #define SLAP_DBFLAG_ACL_ADD            0x20000U /* check attr ACLs on adds */
        slap_mask_t     be_flags;

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index e0b7fb810b692620f2cded785ed9eb4c887b7ccd..3c15b5b54ffc1c861db156eef93e995e6cb7d579 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -4539,7 +4539,7 @@ syncrepl_config( ConfigArgs *c )
                        }
                }
                if ( !c->be->be_syncinfo ) {
-                       SLAP_DBFLAGS( c->be ) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW);
+                       SLAP_DBFLAGS( c->be ) &= ~SLAP_DBFLAG_SHADOW_MASK;
                        if ( cs ) {
                                ber_bvarray_free( cs->cs_vals );
                                ldap_pvt_thread_mutex_destroy( &cs->cs_mutex );