Author: abartlet Date: 2007-03-07 10:17:50 +0000 (Wed, 07 Mar 2007) New Revision: 21741
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21741 Log: Like starting smbd, ensure we have acutally started slapd, and it is listening, before we continue. Andrew Bartlett Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh branches/SAMBA_4_0/source/script/tests/selftest.pl Changeset: Modified: branches/SAMBA_4_0/source/script/tests/mktestsetup.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2007-03-07 10:00:14 UTC (rev 21740) +++ branches/SAMBA_4_0/source/script/tests/mktestsetup.sh 2007-03-07 10:17:50 UTC (rev 21741) @@ -255,8 +255,7 @@ 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 "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" Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl =================================================================== --- branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-03-07 10:00:14 UTC (rev 21740) +++ branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-03-07 10:17:50 UTC (rev 21741) @@ -418,7 +418,7 @@ # 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);