s3-selftest Fix use of the 'fake DNS' file

This ensures we don't use netbios before the hosts file and that we do
fill in the fake DNS zone correctly for the way we invoke smbtorture4.
Currently this works because the realm in client.conf is "", if this
changes then this will need to change too (perhaps an additional
entry).

Andrew Bartlett

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 9db3f21bb87b9790ad2165574636e211a5544468..fbb36a2d58d8553f5fdf42e3ee2e3aef965282ad 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -596,7 +596,7 @@ sub write_clientconf($$$)
        private dir = $clientdir/private
        lock dir = $clientdir/lockdir
        ncalrpc dir = $clientdir/ncalrpcdir
-       name resolve order = bcast file
+       name resolve order = file bcast
        panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
        max xmit = 32K
        notify:inotify = false

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b6c851a49d61b1897ccbde5a71c3d5ceb9b00001..9b9bec30a2785d5d41660e235c8215e1849d32f7 100644 (file)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -813,7 +813,7 @@ domusers:X:$gid_domusers:
        print "DONE\n";
 
        open(HOSTS, ">>$ENV{SELFTEST_PREFIX}/dns_host_file") or die("Unable to open $ENV{SELFTEST_PREFIX}/dns_host_file");
-       print HOSTS "A $server $server_ip
+       print HOSTS "A $server. $server_ip
 ";
        close(HOSTS);