ITS#9351 - Always build back-monitor as a static backend

This commit is contained in:
Quanah Gibson-Mount 2020-09-17 15:45:23 +00:00
parent c59ccf5393
commit a3f186880c
190 changed files with 264 additions and 620 deletions

View file

@ -294,7 +294,6 @@ Backends="dnssrv \
mdb \
meta \
asyncmeta \
monitor \
ndb \
null \
passwd \
@ -320,8 +319,6 @@ OL_ARG_ENABLE(meta, [AS_HELP_STRING([--enable-meta], [enable metadirectory backe
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(asyncmeta, [AS_HELP_STRING([--enable-asyncmeta], [enable asynchronous metadirectory backend])],
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(monitor, [AS_HELP_STRING([--enable-monitor], [enable monitor backend])],
yes, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(ndb, [AS_HELP_STRING([--enable-ndb], [enable MySQL NDB Cluster backend])],
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(null, [AS_HELP_STRING([--enable-null], [enable null backend])],
@ -525,7 +522,6 @@ BUILD_LDAP=no
BUILD_MDB=no
BUILD_META=no
BUILD_ASYNCMETA=no
BUILD_MONITOR=no
BUILD_NDB=no
BUILD_NULL=no
BUILD_PASSWD=no
@ -565,7 +561,7 @@ SLAPD_DYNAMIC_OVERLAYS=
SLAPD_MODULES_LDFLAGS=
SLAPD_MODULES_CPPFLAGS=
SLAPD_STATIC_BACKENDS=back-ldif
SLAPD_STATIC_BACKENDS="back-ldif back-monitor"
SLAPD_DYNAMIC_BACKENDS=
SLAPD_PERL_LDFLAGS=
@ -2493,20 +2489,6 @@ fi
AC_DEFINE(SLAPD_MOD_STATIC,1,[statically linked module])
AC_DEFINE(SLAPD_MOD_DYNAMIC,2,[dynamically linked module])
dnl back-monitor goes first (well, after back-config)
if test "$ol_enable_monitor" != no ; then
BUILD_SLAPD=yes
BUILD_MONITOR=$ol_enable_monitor
if test "$ol_enable_monitor" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
MFLAG=SLAPD_MOD_DYNAMIC
else
SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
MFLAG=SLAPD_MOD_STATIC
fi
AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend])
fi
if test "$ol_enable_dnssrv" != no ; then
BUILD_SLAPD=yes
BUILD_DNSSRV=$ol_enable_dnssrv
@ -2987,7 +2969,6 @@ dnl backends
AC_SUBST(BUILD_MDB)
AC_SUBST(BUILD_META)
AC_SUBST(BUILD_ASYNCMETA)
AC_SUBST(BUILD_MONITOR)
AC_SUBST(BUILD_NDB)
AC_SUBST(BUILD_NULL)
AC_SUBST(BUILD_PASSWD)

View file

@ -937,7 +937,6 @@ The following example is for a self-contained push-based replication solution:
> modulepath /usr/local/libexec/openldap
> moduleload back_mdb.la
> moduleload syncprov.la
> moduleload back_monitor.la
> moduleload back_ldap.la
>
> pidfile /usr/local/var/slapd.pid
@ -1021,7 +1020,6 @@ A replica configuration for this type of setup could be:
> modulepath /usr/local/libexec/openldap
> moduleload back_mdb.la
> moduleload syncprov.la
> moduleload back_monitor.la
> moduleload back_ldap.la
>
> pidfile /usr/local/var/slapd.pid

View file

@ -936,9 +936,6 @@
/* statically linked module */
#undef SLAPD_MOD_STATIC
/* define to support cn=Monitor backend */
#undef SLAPD_MONITOR
/* define to support NDB backend */
#undef SLAPD_NDB

View file

@ -844,8 +844,7 @@ ldap_back_monitor_initialize( void )
/* set to 0 when successfully initialized; otherwise, remember failure */
static int ldap_back_monitor_initialized_failure = 1;
/* register schema here; if compiled as dynamic object,
* must be loaded __after__ back_monitor.la */
/* register schema here */
if ( ldap_back_monitor_initialized++ ) {
return ldap_back_monitor_initialized_failure;

View file

@ -28,10 +28,10 @@ LDAP_INCDIR= ../../../include
LDAP_LIBDIR= ../../../libraries
BUILD_OPT = "--enable-monitor"
BUILD_MOD = @BUILD_MONITOR@
BUILD_MOD = yes
mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_MONITOR@_DEFS)
MOD_DEFS = $(yes_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

View file

@ -2562,11 +2562,3 @@ monitor_back_db_destroy(
return 0;
}
#if SLAPD_MONITOR == SLAPD_MOD_DYNAMIC
/* conditionally define the init_module() function */
SLAP_BACKEND_INIT_MODULE( monitor )
#endif /* SLAPD_MONITOR == SLAPD_MOD_DYNAMIC */

View file

@ -116,11 +116,8 @@ int backend_init(void)
LDAP_STAILQ_INSERT_TAIL(&backendInfo, bi, bi_next);
}
#if defined(SLAPD_MONITOR) && SLAPD_MONITOR == SLAPD_MOD_STATIC
/* HACK: need schema defined in deterministic order */
syncrepl_monitor_init();
#endif
if ( nBackendInfo > 0) {
return 0;

View file

@ -306,12 +306,7 @@ static Connection* connection_get( ber_socket_t s )
assert( c->c_conn_state != SLAP_C_INVALID );
assert( c->c_sd != AC_SOCKET_INVALID );
#ifndef SLAPD_MONITOR
if ( global_idletimeout > 0 )
#endif /* ! SLAPD_MONITOR */
{
c->c_activitytime = slap_get_time();
}
c->c_activitytime = slap_get_time();
}
return c;
@ -463,12 +458,7 @@ Connection * connection_init(
/* set to zero until bind, implies LDAP_VERSION3 */
c->c_protocol = 0;
#ifndef SLAPD_MONITOR
if ( global_idletimeout > 0 )
#endif /* ! SLAPD_MONITOR */
{
c->c_activitytime = c->c_starttime = slap_get_time();
}
c->c_activitytime = c->c_starttime = slap_get_time();
#ifdef LDAP_CONNECTIONLESS
c->c_is_udp = 0;
@ -960,7 +950,6 @@ void connection_done( Connection *c )
* calls the appropriate stub to handle it.
*/
#ifdef SLAPD_MONITOR
/* FIXME: returns 0 in case of failure */
#define INCR_OP_INITIATED(index) \
do { \
@ -975,15 +964,6 @@ void connection_done( Connection *c )
ldap_pvt_mp_add_ulong(op->o_counters->sc_ops_completed_[(index)], 1); \
ldap_pvt_thread_mutex_unlock( &op->o_counters->sc_mutex ); \
} while (0)
#else /* !SLAPD_MONITOR */
#define INCR_OP_INITIATED(index) do { } while (0)
#define INCR_OP_COMPLETED(index) \
do { \
ldap_pvt_thread_mutex_lock( &op->o_counters->sc_mutex ); \
ldap_pvt_mp_add_ulong(op->o_counters->sc_ops_completed, 1); \
ldap_pvt_thread_mutex_unlock( &op->o_counters->sc_mutex ); \
} while (0)
#endif /* !SLAPD_MONITOR */
/*
* NOTE: keep in sync with enum in slapd.h
@ -1023,12 +1003,10 @@ conn_counter_destroy( void *key, void *data )
ldap_pvt_mp_add( slap_counters.sc_refs, sc->sc_refs );
ldap_pvt_mp_add( slap_counters.sc_ops_initiated, sc->sc_ops_initiated );
ldap_pvt_mp_add( slap_counters.sc_ops_completed, sc->sc_ops_completed );
#ifdef SLAPD_MONITOR
for ( i = 0; i < SLAP_OP_LAST; i++ ) {
ldap_pvt_mp_add( slap_counters.sc_ops_initiated_[ i ], sc->sc_ops_initiated_[ i ] );
ldap_pvt_mp_add( slap_counters.sc_ops_initiated_[ i ], sc->sc_ops_completed_[ i ] );
}
#endif /* SLAPD_MONITOR */
slap_counters_destroy( sc );
ber_memfree_x( data, NULL );
break;

View file

@ -297,12 +297,10 @@ void slap_counters_init( slap_counters_t *sc )
ldap_pvt_mp_init( sc->sc_ops_initiated );
ldap_pvt_mp_init( sc->sc_ops_completed );
#ifdef SLAPD_MONITOR
for ( i = 0; i < SLAP_OP_LAST; i++ ) {
ldap_pvt_mp_init( sc->sc_ops_initiated_[ i ] );
ldap_pvt_mp_init( sc->sc_ops_completed_[ i ] );
}
#endif /* SLAPD_MONITOR */
}
void slap_counters_destroy( slap_counters_t *sc )
@ -318,11 +316,9 @@ void slap_counters_destroy( slap_counters_t *sc )
ldap_pvt_mp_clear( sc->sc_ops_initiated );
ldap_pvt_mp_clear( sc->sc_ops_completed );
#ifdef SLAPD_MONITOR
for ( i = 0; i < SLAP_OP_LAST; i++ ) {
ldap_pvt_mp_clear( sc->sc_ops_initiated_[ i ] );
ldap_pvt_mp_clear( sc->sc_ops_completed_[ i ] );
}
#endif /* SLAPD_MONITOR */
}

View file

@ -2551,10 +2551,8 @@ typedef struct slap_counters_t {
ldap_pvt_mp_t sc_ops_completed;
ldap_pvt_mp_t sc_ops_initiated;
#ifdef SLAPD_MONITOR
ldap_pvt_mp_t sc_ops_completed_[SLAP_OP_LAST];
ldap_pvt_mp_t sc_ops_initiated_[SLAP_OP_LAST];
#endif /* SLAPD_MONITOR */
} slap_counters_t;
/*

View file

@ -24,7 +24,7 @@ USER="uid=user1,ou=People,dc=example,dc=com"
PASS="abc"
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF1
$SLAPADD -f $CONF1 -l $ITSDIR/adds.ldif
RC=$?
if test $RC != 0 ; then

View file

@ -32,7 +32,7 @@ ITS=4326
ITSDIR=$DATADIR/regressions/its$ITS
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
. $CONFFILTER $BACKEND < $CONF > $CONF1
$SLAPADD -f $CONF1 -l $LDIFORDERED
RC=$?
if test $RC != 0 ; then
@ -70,7 +70,7 @@ if test $RC != 0 ; then
fi
echo "Starting proxy slapd on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF2
$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
PROXYPID=$!
if test $WAIT != 0 ; then

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.2.args
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -42,4 +40,4 @@ idassert-bind bindmethod=simple
mode=self
flags=non-prescriptive
#monitor#database monitor
database monitor

View file

@ -37,7 +37,7 @@ ITS=4336
ITSDIR=$DATADIR/regressions/its$ITS
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $RETCODECONF > $CONF1
. $CONFFILTER $BACKEND < $RETCODECONF > $CONF1
$SLAPADD -f $CONF1 -l $LDIFORDERED
RC=$?
if test $RC != 0 ; then
@ -75,7 +75,7 @@ if test $RC != 0 ; then
fi
echo "Starting chain slapd on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF2
$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
PROXYPID=$!
if test $WAIT != 0 ; then

View file

@ -27,11 +27,8 @@ argsfile @TESTDIR@/slapd.2.args
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
# no database; only a referral to another DSA, with anonymous chaining
referral "@URI1@"
overlay chain
#monitor#database monitor
database monitor

View file

@ -48,7 +48,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
ITSCONF=$ITSDIR/slapd-meta.conf
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
. $CONFFILTER $BACKEND < $CONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
@ -104,7 +104,7 @@ if test $RC != 0 ; then
fi
echo "Starting slapd on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
. $CONFFILTER $BACKEND < $METACONF2 > $CONF2
$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
PID=$!
if test $WAIT != 0 ; then
@ -143,7 +143,7 @@ if test $RC != 0 ; then
fi
echo "Starting slapd on TCP/IP port $PORT3..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSCONF > $CONF3
. $CONFFILTER $BACKEND < $ITSCONF > $CONF3
$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
PID=$!
if test $WAIT != 0 ; then

View file

@ -29,8 +29,6 @@ argsfile @TESTDIR@/slapd.m.args
#ldapmod#moduleload back_ldap.la
#metamod#modulepath ../servers/slapd/back-meta/
#metamod#moduleload back_meta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
@ -57,4 +55,4 @@ idassert-bind bindmethod=simple
mode=none
idassert-authzFrom "*"
#monitor#database monitor
database monitor

View file

@ -24,7 +24,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
ITSCONF=$ITSDIR/slapd-glue.conf
echo "Running multi-threaded slapadd in quick mode to build glued slapd databases..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSCONF > $CONF1
. $CONFFILTER $BACKEND < $ITSCONF > $CONF1
$SLAPADD -q -d $LVL -f $CONF1 -l $LDIFORDERED > $SLAPADDLOG1 2>&1
RC=$?
if test $RC != 0 ; then

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
tool-threads 4
#######################################################################
# database definitions
@ -63,4 +61,4 @@ rootpw secret
#ndb#dbname db_3
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -31,7 +31,7 @@ cp $PERLPM $TESTDIR
$SLAPPASSWD -g -n >$CONFIGPWF
echo "Starting slapd on TCP/IP port $PORT1... $PWD"
. $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
. $CONFFILTER $BACKEND < $DYNAMICCONF > $CONFLDIF
$SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
cd $TESTDIR
$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &

View file

@ -41,7 +41,7 @@ ITS=8427
ITSDIR=$DATADIR/regressions/its$ITS
echo "Running slapadd to build slapd database..."
. $CONFFILTER $BACKEND $MONITORDB < $TLSCONF > $CONF1
. $CONFFILTER $BACKEND < $TLSCONF > $CONF1
$SLAPADD -f $CONF1 -l $LDIFORDERED
RC=$?
if test $RC != 0 ; then
@ -85,7 +85,7 @@ echo "database config" >> $CONF2
echo "include $TESTDIR/configpw.conf" >> $CONF2
echo "Starting proxy slapd on TCP/IP port $PORT3..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF2
$SLAPD -f $CONF2 -h $URI3 -d $LVL > $LOG2 2>&1 &
PROXYPID=$!
if test $WAIT != 0 ; then

View file

@ -25,10 +25,7 @@ argsfile @TESTDIR@/slapd.2.args
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf

View file

@ -59,7 +59,7 @@ while [ $n -le $MPR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
$SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
n=`expr $n + 1`
done

View file

@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la

View file

@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la

View file

@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la

View file

@ -24,15 +24,9 @@ include: file://@TESTWD@/@SCHEMADIR@/dyngroup.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#memberofmod#dn: cn=module{2},cn=config
#memberofmod#dn: cn=module{1},cn=config
#memberofmod#objectClass: olcModuleList
#memberofmod#cn: module{2}
#memberofmod#cn: module{1}
#memberofmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#memberofmod#olcModuleLoad: {0}memberof.la
#dynlistmod#olcModuleLoad: {1}dynlist.la

View file

@ -45,7 +45,7 @@ ITS=8521
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
@ -76,7 +76,7 @@ if test $RC != 0 ; then
fi
echo "Starting consumer slapd on TCP/IP port $PORT2..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
$SLAPADD -F $CFCON -n 0 -l $CONFLDIF
$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
SLAVEPID=$!

View file

@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig

View file

@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig

View file

@ -38,7 +38,7 @@ ITS=8616
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!

View file

@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig

View file

@ -38,7 +38,7 @@ ITS=8663
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!

View file

@ -21,12 +21,6 @@ include: file://@TESTWD@/@SCHEMADIR@/misc.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig

View file

@ -36,7 +36,7 @@ ITS=8667
ITSDIR=$DATADIR/regressions/its$ITS
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd.ldif > $CONFLDIF
$SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
echo "Populating root database..."

View file

@ -20,12 +20,6 @@ include: file://@TESTWD@/@SCHEMADIR@/inetorgperson.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
dn: olcDatabase={-1}frontend,cn=config
objectClass: olcDatabaseConfig
objectClass: olcFrontendConfig

View file

@ -68,7 +68,7 @@ done
KILLPIDS=
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
@ -170,7 +170,7 @@ while [ $n -le $MPR ]; do
MYLOG=`eval echo '$LOG'$n`
MYCONF=`eval echo '$CONF'$n`
echo "Starting provider slapd on TCP/IP URI $MYURI"
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
sed -e "s/MPR/$n/g" -e "s/wronglog/log/" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF
j=1
while [ $j -le $MPR ]; do
@ -388,7 +388,7 @@ while [ $n -le $MPR ]; do
MYLOG=`eval echo '$LOG'$n`
MYCONF=`eval echo '$CONF'$n`
echo "Starting provider slapd on TCP/IP URI $MYURI"
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
. $CONFFILTER $BACKEND < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf
sed -e "s/MPR/$n/g" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF
j=1
while [ $j -le $MPR ]; do

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
database config
rootpw config
@ -40,4 +38,4 @@ rootpw secret
#indexdb#index objectClass eq
#indexdb#index cn,sn,uid pres,eq,sub
#monitor#database monitor
database monitor

View file

@ -27,8 +27,6 @@ argsfile @TESTDIR@/slapd.MPR.args
serverid MPR
#mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#accesslogmod#modulepath ../servers/slapd/overlays/
@ -141,4 +139,4 @@ overlay syncprov
syncprov-reloadhint true
syncprov-nopresent true
#monitor#database monitor
database monitor

View file

@ -56,7 +56,7 @@ while [ $n -le $MPR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
. $CONFFILTER $BACKEND < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
$SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
$SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
n=`expr $n + 1`

View file

@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la

View file

@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la

View file

@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la

View file

@ -23,15 +23,9 @@ include: file://@TESTWD@/@SCHEMADIR@/nis.ldif
#mod#olcModulePath: @TESTWD@/../servers/slapd/back-@BACKEND@/
#mod#olcModuleLoad: {0}back_@BACKEND@.la
#monitormod#dn: cn=module{1},cn=config
#monitormod#objectClass: olcModuleList
#monitormod#cn: module{1}
#monitormod#olcModulePath: @TESTWD@/../servers/slapd/back-monitor/
#monitormod#olcModuleLoad: {0}back_monitor.la
#syncprovmod#dn: cn=module{2},cn=config
#syncprovmod#dn: cn=module{1},cn=config
#syncprovmod#objectClass: olcModuleList
#syncprovmod#cn: module{2}
#syncprovmod#cn: module{1}
#syncprovmod#olcModulePath: @TESTWD@/../servers/slapd/overlays/
#syncprovmod#olcModuleLoad: {0}syncprov.la
#accesslogmod#olcModuleLoad: {1}accesslog.la

View file

@ -48,7 +48,7 @@ while [ $n -le $MMR ]; do
CFDIR=${XDIR}$n/slapd.d
mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
. $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/config.ldif > $TESTDIR/config${n}.ldif
. $CONFFILTER $BACKEND < $ITSDIR/config.ldif > $TESTDIR/config${n}.ldif
if [ $n = 1 ]; then
MYURI=`eval echo '$URI2'`
else

View file

@ -41,7 +41,7 @@ echo ""
#
echo "Starting provider slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
. $CONFFILTER $BACKEND < $SRPROVIDERCONF > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -49,4 +47,4 @@ rootpw secret
#ndb#dbname db_2
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#acimod#modulepath ../servers/slapd/
#acimod#moduleload aci.la
@ -54,5 +52,5 @@ rootpw secret
access to dn.subtree="dc=example,dc=com"
by dynacl/aci write
#monitor#database monitor
#monitor#rootdn "cn=Monitor"
database monitor
rootdn "cn=Monitor"

View file

@ -33,8 +33,6 @@ access to *
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -143,4 +141,4 @@ access to dn.subtree="ou=Add & Delete,dc=example,dc=com"
# fall into global ACLs
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.m.args
#ldapmod#moduleload back_ldap.la
#asyncmetamod#modulepath ../servers/slapd/back-asyncmeta/
#asyncmetamod#moduleload back_asyncmeta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
# seems to improve behavior under very heavy load
# (i.e. it alleviates load on target systems)
@ -84,4 +82,4 @@ rootdn "cn=Manager,o=Local"
rootpw secret
uri "@URI6@o=Local"
#monitor#database monitor
database monitor

View file

@ -27,8 +27,6 @@ disallow bind_anon
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -44,4 +42,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -41,4 +39,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#
# uses the chain overlay as global;
@ -60,4 +58,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -59,4 +57,4 @@ chain-idassert-bind bindmethod=simple
mode=self
flags=non-prescriptive
#monitor#database monitor
database monitor

View file

@ -29,8 +29,6 @@ moduleload @DATADIR@/comp_libs/compmatch.la
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -45,4 +43,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -5,10 +5,8 @@ include @SCHEMADIR@/openldap.schema
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf

View file

@ -2,8 +2,6 @@ include @SCHEMADIR@/core.schema
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
database @BACKEND@
suffix "o=undo"
@ -15,7 +13,7 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#ddsmod#modulepath ../servers/slapd/overlays/
#ddsmod#moduleload dds.la
@ -84,4 +82,4 @@ access to dn.onelevel="ou=Groups,dc=example,dc=com"
access to *
by * read
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
@ -73,4 +71,4 @@ updateref @URI1@
overlay syncprov
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#accesslogmod#modulepath ../servers/slapd/overlays/
@ -72,4 +70,4 @@ logdb cn=log
logops writes
logsuccess true
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
@ -64,4 +62,4 @@ updateref @URI1@
overlay syncprov
syncprov-sessionlog 100
#monitor#database monitor
database monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -43,4 +41,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -22,14 +22,12 @@ sasl-secprops noanonymous
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
#######################################################################
#monitor#database monitor
database monitor
database dnssrv
suffix ""

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# consumer database definitions
@ -60,4 +58,4 @@ syncrepl rid=1
retry="3 +" interval=00:00:00:03
updateref @URI1@
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.4.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# consumer database definitions
@ -60,4 +58,4 @@ syncrepl rid=1
retry="3 5 300 5"
updateref @URI1@
#monitor#database monitor
database monitor

View file

@ -27,8 +27,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#dynlistmod#modulepath ../servers/slapd/overlays/
#dynlistmod#moduleload dynlist.la
@ -36,7 +34,7 @@ argsfile @TESTDIR@/slapd.1.args
# database definitions
#######################################################################
#monitor#database monitor
database monitor
database @BACKEND@
suffix "dc=example,dc=com"

View file

@ -31,8 +31,6 @@ access to dn.exact="cn=Subschema"
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -57,9 +55,9 @@ access to dn.subtree="dc=example,dc=com"
by dn.exact="cn=Manager,c=US" write
by * read
#monitor#database monitor
#monitor#access to dn.subtree="cn=Monitor"
#monitor# by * read
database monitor
access to dn.subtree="cn=Monitor"
by * read
database @BACKEND@
suffix ""

View file

@ -29,8 +29,6 @@ argsfile @TESTDIR@/slapd.m.args
#ldapmod#moduleload back_ldap.la
#metamod#modulepath ../servers/slapd/back-meta/
#metamod#moduleload back_meta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
@ -78,4 +76,4 @@ rootdn "cn=Manager,o=Local"
rootpw secret
uri "@URI6@"
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
#######################################################################
@ -86,4 +84,4 @@ rootpw secret
#overlay syncprov
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
#######################################################################
@ -89,4 +87,4 @@ rootpw secret
#overlay syncprov
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -63,4 +61,4 @@ rootpw secret
#ndb#dbname db_3
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
@ -122,6 +120,6 @@ access to *
by dn.exact="cn=Sandbox,ou=Admin,dc=example,dc=com" search
by * none
#monitor#database monitor
#monitor#rootdn "cn=monitor"
#monitor#rootpw monitor
database monitor
rootdn "cn=monitor"
rootpw monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -76,4 +74,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.3.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -58,4 +56,4 @@ rootpw secret
#ndb#dbname db_6
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -60,4 +58,4 @@ rootpw secret
#ndb#dbname db_5
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -61,4 +59,4 @@ limits dn.subtree="ou=Admin,dc=example,dc=com" size.soft=3
limits users size.soft=2
limits anonymous size.soft=1
#monitor#database monitor
database monitor

View file

@ -29,8 +29,6 @@ sockbuf_max_incoming 4194303
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -61,4 +59,4 @@ access to *
by dn="cn=Manager,o=Local" write
by * read
#monitor#database monitor
database monitor

View file

@ -29,8 +29,6 @@ argsfile @TESTDIR@/slapd.2.args
#ldapmod#moduleload back_ldap.la
#metamod#modulepath ../servers/slapd/back-meta/
#metamod#moduleload back_meta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
@ -55,4 +53,4 @@ access to *
by dn="cn=Manager,o=Local" write
by * read
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.m.args
#ldapmod#moduleload back_ldap.la
#metamod#modulepath ../servers/slapd/back-meta/
#metamod#moduleload back_meta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
# seems to improve behavior under very heavy load
# (i.e. it alleviates load on target systems)
@ -82,4 +80,4 @@ rootdn "cn=Manager,o=Local"
rootpw secret
uri "@URI6@o=Local"
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -52,4 +50,4 @@ index ipNetworkNumber pres,eq,approx
index ipProtocolNumber pres,eq,approx
index default none
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -36,4 +34,4 @@ rootdn "cn=Manager,dc=example,dc=com"
rootpw secret
#file ./data/passwd
#monitor#database monitor
database monitor

View file

@ -21,8 +21,6 @@ include @SCHEMADIR@/nis.schema
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#ppolicymod#modulepath ../servers/slapd/overlays/
#ppolicymod#moduleload ppolicy.la
@ -54,7 +52,7 @@ access to *
by self write
by * read
#monitor#database monitor
database monitor
database config
include @TESTDIR@/configpw.conf

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -42,4 +40,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#pcachemod#modulepath ../servers/slapd/overlays/
#pcachemod#moduleload pcache.la
@ -72,4 +70,4 @@ pcachebind (cn=) 0 3600 sub ou=people,dc=example,dc=com
#ndb#dbname db_2
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#moduleload back_@BACKEND@.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#pcachemod#modulepath ../servers/slapd/overlays/
#pcachemod#moduleload pcache.la
@ -62,4 +60,4 @@ pcachebind (&(objectclass=person)(uid=)) 1 @BTTR@ sub "ou=Alumni Association,ou
#ndb#dbname db_2
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -55,4 +53,4 @@ access to *
by self write
by * read
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -44,4 +42,4 @@ rootpw secret
#ndb#dbname db_2
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -23,8 +23,6 @@ argsfile @TESTDIR@/slapd.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -39,4 +37,4 @@ rootpw secret
#ndb#dbname db_1
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -25,8 +25,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#refintmod#modulepath ../servers/slapd/overlays/
#refintmod#moduleload refint.la
@ -47,4 +45,4 @@ rootpw secret
overlay refint
refint_attributes manager secretary member
#monitor#database monitor
database monitor

View file

@ -29,8 +29,6 @@ argsfile @TESTDIR@/slapd.args
#ldapmod#moduleload back_ldap.la
#metamod#modulepath ../servers/slapd/back-meta/
#metamod#moduleload back_meta.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#rwmmod#modulepath ../servers/slapd/overlays/
#rwmmod#moduleload rwm.la
@ -99,4 +97,4 @@ suffix "o=Beispiel,c=DE"
#relay-meta#uri "@URI1@o=Beispiel,c=DE"
#relay-meta#suffixmassage "o=Beispiel,c=DE" "dc=example,dc=com"
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
#ldapmod#moduleload back_ldap.la
@ -75,6 +73,6 @@ access to dn.subtree="dc=example,dc=com"
by dn.exact="cn=Monitor" write
by * read
#monitor#database monitor
#monitor#rootdn "cn=Monitor"
#monitor#rootpw monitor
database monitor
rootdn "cn=Monitor"
rootpw monitor

View file

@ -26,8 +26,6 @@ argsfile @TESTDIR@/slapd.1.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#retcodemod#modulepath ../servers/slapd/overlays/
#retcodemod#moduleload retcode.la
@ -54,4 +52,4 @@ retcode-item "cn=Notice of Disconnect" 0x00 unsolicited="1.3.6.1.4.1.1466.20036"
retcode-item "cn=Pre-disconnect" 0x34 flags="pre-disconnect"
retcode-item "cn=Post-disconnect" 0x34 flags="post-disconnect"
#monitor#database monitor
database monitor

View file

@ -36,8 +36,6 @@ rootdse @DATADIR@/rootdse.ldif
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# database definitions
@ -50,4 +48,4 @@ suffix "o=OpenLDAP Project,l=Internet"
#ndb#dbname db_1_a
#ndb#include @DATADIR@/ndb.conf
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#sqlmod#modulepath ../servers/slapd/back-sql/
#sqlmod#moduleload back_sql.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
@ -77,4 +75,4 @@ has_ldapinfo_dn_ru no
overlay syncprov
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.1.args
#sqlmod#modulepath ../servers/slapd/back-sql/
#sqlmod#moduleload back_sql.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#
# normal installations should protect root dse,
@ -73,4 +71,4 @@ dbpasswd secret
has_ldapinfo_dn_ru no
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.3.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
@ -73,4 +71,4 @@ syncrepl rid=1
overlay syncprov
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.4.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
#ldapmod#modulepath ../servers/slapd/back-ldap/
@ -71,4 +69,4 @@ updateref @URI1@
overlay syncprov
#monitor#database monitor
database monitor

View file

@ -12,8 +12,6 @@ argsfile @TESTDIR@/slapd.5.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# consumer database definitions
@ -43,4 +41,4 @@ syncrepl rid=1
scope=sub
type=refreshAndPersist
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.6.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#######################################################################
# consumer database definitions
@ -55,4 +53,4 @@ syncrepl rid=1
scope=sub
type=refreshAndPersist
#monitor#database monitor
database monitor

View file

@ -24,8 +24,6 @@ argsfile @TESTDIR@/slapd.2.args
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#monitormod#modulepath ../servers/slapd/back-monitor/
#monitormod#moduleload back_monitor.la
#syncprovmod#modulepath ../servers/slapd/overlays/
#syncprovmod#moduleload syncprov.la
@ -62,4 +60,4 @@ updateref @URI1@
overlay syncprov
syncprov-sessionlog 100
#monitor#database monitor
database monitor

Some files were not shown because too many files have changed in this diff Show more