diff options
| author | Andreas Schneider <asn@samba.org> | 2016-06-17 13:03:34 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2016-06-17 18:15:21 +0200 |
| commit | 341d06fa24bbf159572565be08f2741931a39509 (patch) | |
| tree | de75922edcc6795affbdf8f17250f5269762c880 /selftest/target | |
| parent | 61cb3a6a3b948b2c1768d29236a59c3620fc4331 (diff) | |
| download | samba-341d06fa24bbf159572565be08f2741931a39509.tar.gz | |
selftest: Use the correct smb.conf for ldbsearch
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/target')
| -rwxr-xr-x | selftest/target/Samba4.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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}"); |