From: Andreas Schneider <asn@samba.org>
Date: Fri, 17 Jun 2016 11:03:34 +0000 (+0200)
Subject: selftest: Use the correct smb.conf for ldbsearch
X-Git-Tag: tdb-1.3.10~817
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=341d06fa24bbf159572565be08f2741931a39509;p=thirdparty%2Fsamba.git

selftest: Use the correct smb.conf for ldbsearch

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 184b9492e12..9d0b7496e7f 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -215,8 +215,9 @@ sub wait_for_start($$)
 	    my $base_dn = "DC=".join(",DC=", split(/\./, $testenv_vars->{REALM}));
 	    my $rid_set_dn = "cn=RID Set,cn=$testenv_vars->{NETBIOSNAME},ou=domain controllers,$base_dn";
 	    my $max_wait = 60;
+	    my $cmd = "$ldbsearch $testenv_vars->{CONFIGURATION} -H ldap://$testenv_vars->{SERVER} -U$testenv_vars->{USERNAME}%$testenv_vars->{PASSWORD} -s base -b \"$rid_set_dn\" rIDAllocationPool";
 	    sleep(1);
-	    while (system("$ldbsearch -H ldap://$testenv_vars->{SERVER} -U$testenv_vars->{USERNAME}%$testenv_vars->{PASSWORD} -s base -b \"$rid_set_dn\" rIDAllocationPool > /dev/null") != 0) {
+	    while (system("$cmd >/dev/null") != 0) {
 		$count++;
 		if ($count > $max_wait) {
 		    warn("Timed out ($max_wait sec) waiting for working LDAP and a RID Set to be allocated by $testenv_vars->{NETBIOSNAME} PID $testenv_vars->{SAMBA_PID}");