works with "restrict all": in principle, this slapd should be started without any...

diff --git a/tests/data/slapd-syncrepl-slave-persist-ldap.conf b/tests/data/slapd-syncrepl-slave-persist-ldap.conf
index f94fcd7c33a25a9470a87028237b05e6e6073c7c..5ab772cfc1f0adb4d8e0e7fbacaaa241e84ce8ad 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-persist-ldap.conf
+++ b/tests/data/slapd-syncrepl-slave-persist-ldap.conf
@@ -31,12 +31,14 @@ argsfile    @TESTDIR@/slapd.3.args
 #ldapmod#modulepath ../servers/slapd/back-ldap/
 #ldapmod#moduleload back_ldap.la
 
+# We don't need any access to this DSA
+restrict       all
+
 #######################################################################
 # consumer proxy database definitions
 #######################################################################
 
 database       ldap
-restrict       all
 suffix         "dc=example,dc=com"
 rootdn         "cn=Whoever"
 uri            @URI2@

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index 85bd1622bd358912c5b23d4e67b4b8c817314b28..7e0956838b2e0cc7452394242e884532b28ed8a7 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -140,18 +140,27 @@ for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \
                '(objectClass=*)' > /dev/null 2>&1
        RC=$?
-       if test $RC = 0 ; then
+       if test $RC = 0 -o $RC = 53 ; then
                break
        fi
        echo "Waiting 5 seconds for slapd to start..."
        sleep 5
 done
 
-if test $RC != 0 ; then
+case $RC in
+0 )
+       echo "ldapsearch should have failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit -1
+       ;;
+53)
+       ;;
+*)
        echo "ldapsearch failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
-fi
+       ;;
+esac
 
 echo "Using ldapadd to populate the master directory..."
 $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \