mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#10142 Link tiers in on cn=config startup

Browse Source
This commit is contained in:
Ondřej Kuzník 2023-12-11 17:05:02 +00:00 committed by Quanah Gibson-Mount
parent e40d3640a7
commit f141416f32
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/lloadd/config.c
View File

@ -3870,6 +3870,14 @@ lload_tier_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
ca->bi = p->ce_bi;
ca->ca_private = tier;
if ( !lloadd_inited ) {
if ( LDAP_STAILQ_EMPTY( &tiers ) ) {
LDAP_STAILQ_INSERT_HEAD( &tiers, tier, t_next );
} else {
LDAP_STAILQ_INSERT_TAIL( &tiers, tier, t_next );
}
}
/* ca cleanups are only run in the case of online config but we use it to
* save the new config when done with the entry */
ca->lineno = 0;

5
tests/scripts/lloadd/test003-cnconfig
View File

@ -16,7 +16,7 @@
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
mkdir -p $TESTDIR $CONF1.d $DBDIR1 $DBDIR2
mkdir -p $TESTDIR $CONF1.d $DBDIR1 $DBDIR2 $CFDIR
$SLAPPASSWD -g -n >$CONFIGPWF
echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
@ -119,7 +119,8 @@ fi
echo "Starting lloadd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND < $LLOADDUNREACHABLECONF > $CONF1.lloadd
. $CONFFILTER $BACKEND < $SLAPDLLOADCONF > $CONF1.slapd
$SLAPD -f $CONF1.slapd -h $URI6 -d $LVL > $LOG1 2>&1 &
$SLAPD -Tt -f $CONF1.slapd -F $CONF1.d -d $LVL > $LOG1 2>&1
$SLAPD -F $CONF1.d -h $URI6 -d $LVL >> $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
echo PID $PID