From: Kurt Zeilenga Date: Fri, 11 Jan 2002 02:31:47 +0000 (+0000) Subject: Flip some bits in the backend flags mask X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~197 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=504404725acbb3237b5c61ebb6b9d41de7334ded;p=openldap Flip some bits in the backend flags mask --- diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 221ef9c22a..7442953c7d 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -204,8 +204,6 @@ read_config( const char *fname ) bi = NULL; be = backend_db_init( cargv[1] ); - if( lastmod ) be->be_flags |= SLAP_BFLAG_LASTMOD; - if( be == NULL ) { #ifdef NEW_LOGGING LDAP_LOG(( "config", LDAP_LEVEL_CRIT, @@ -1995,15 +1993,17 @@ read_config( const char *fname ) return( 1 ); } if ( strcasecmp( cargv[1], "on" ) == 0 ) { - if ( be ) - be->be_flags |= SLAP_BFLAG_LASTMOD; - else + if ( be ) { + be->be_flags &= ~SLAP_BFLAG_NOLASTMOD; + } else { lastmod = ON; + } } else { - if ( be ) - be->be_flags &= ~SLAP_BFLAG_LASTMOD; - else + if ( be ) { + be->be_flags |= SLAP_BFLAG_NOLASTMOD; + } else { lastmod = OFF; + } } /* set idle timeout value */ diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 9e82409493..3bfcc738e2 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1015,19 +1015,20 @@ struct slap_backend_db { #define be_sync bd_info->bi_tool_sync #endif -#define SLAP_BFLAG_LASTMOD 0x0001U - +#define SLAP_BFLAG_NOLASTMOD 0x0001U #define SLAP_BFLAG_GLUE_INSTANCE 0x0010U /* a glue backend */ #define SLAP_BFLAG_GLUE_SUBORDINATE 0x0020U /* child of a glue hierarchy */ #define SLAP_BFLAG_GLUE_LINKED 0x0040U /* child is connected to parent */ - #define SLAP_BFLAG_ALIASES 0x0100U -#define SLAP_BFLAG_MONITOR 0x0200U -#define SLAP_BFLAG_REFERRALS 0x0400U -#define SLAP_BFLAG_SUBENTRIES 0x0800U - +#define SLAP_BFLAG_REFERRALS 0x0200U +#define SLAP_BFLAG_SUBENTRIES 0x0400U +#define SLAP_BFLAG_NOMONITOR 0x1000U slap_mask_t be_flags; -#define SLAP_LASTMOD(be) ((be)->be_flags & SLAP_BFLAG_LASTMOD) +#define SLAP_LASTMOD(be) (!((be)->be_flags & SLAP_BFLAG_NOLASTMOD)) +#define SLAP_ALIASES(be) ((be)->be_flags & SLAP_BFLAG_ALIASES) +#define SLAP_REFERRALS(be) ((be)->be_flags & SLAP_BFLAG_REFERRALS) +#define SLAP_SUBENTRIES(be) ((be)->be_flags & SLAP_BFLAG_SUBENTRIES) +#define SLAP_MONITOR(be) (!(be)->be_flags & SLAP_BFLAG_NOMONITOR)) slap_mask_t be_restrictops; /* restriction operations */ #define SLAP_RESTRICT_OP_ADD 0x0001U