summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-03-07 10:17:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:21 -0500
commitd500181515dc1d4a19bc39a13093a7543a5dd08e (patch)
tree926a9c17d82373dd4bb95ad66ad9541256f19dae /source4
parent793db3bc5073083e223d084437c6e751d422416d (diff)
downloadsamba-d500181515dc1d4a19bc39a13093a7543a5dd08e.tar.gz
samba-d500181515dc1d4a19bc39a13093a7543a5dd08e.tar.bz2
samba-d500181515dc1d4a19bc39a13093a7543a5dd08e.zip
r21741: Like starting smbd, ensure we have acutally started slapd, and it is
listening, before we continue. Andrew Bartlett (This used to be commit 171540e06a3eb42320238ad81bc9993e86137dc7)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/script/tests/mktestsetup.sh4
-rwxr-xr-xsource4/script/tests/selftest.pl2
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index 573af70150..2068728a49 100755
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -255,8 +255,7 @@ PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT"
PROVISION_OPTIONS="$PROVISION_OPTIONS --simple-bind-dn=cn=Manager,$BASEDN --password=$PASSWORD --root=$ROOT"
$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS >&2
-LDAP_URI="ldapi://$LDAPDIR/ldapi"
-LDAP_URI_ESCAPE="ldapi://"`echo $LDAPDIR/ldapi | sed 's|/|%2F|g'`
+LDAP_URI="ldapi://"`echo $LDAPDIR/ldapi | sed 's|/|%2F|g'`
. `dirname $0`/mk-openldap.sh
@@ -287,7 +286,6 @@ echo "AUTH=$AUTH"
echo "SERVER=$SERVER"
echo "NETBIOSNAME=$NETBIOSNAME"
echo "LDAP_URI=$LDAP_URI"
-echo "LDAP_URI_ESCAPE=$LDAP_URI_ESCAPE"
echo "DOMAIN=$DOMAIN"
echo "USERNAME=$USERNAME"
echo "REALM=$REALM"
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index a9a6ca4851..31d0118083 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -418,7 +418,7 @@ if ($opt_socket_wrapper)
# Start slapd before smbd
if ($ldap) {
- Samba4::slapd_start($ENV{SLAPD_CONF}, $ENV{LDAP_URI_ESCAPE}) or die("couldn't start slapd");
+ Samba4::slapd_start($bindir, $ENV{SLAPD_CONF}, $ENV{LDAP_URI}) or die("couldn't start slapd");
print "LDAP PROVISIONING...";
Samba4::provision_ldap($bindir, $setupdir);