summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-07 12:33:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-07 14:35:36 +1000
commit1862e904a821e2cd6132ab1d13b02da123edd94e (patch)
tree3487e7a249b5fb40fe81385d81c58af4239fe1cd
parent1367e2b303bb11f26552ee511a823ea551e98cbd (diff)
downloadsamba-1862e904a821e2cd6132ab1d13b02da123edd94e.tar.gz
samba-1862e904a821e2cd6132ab1d13b02da123edd94e.tar.bz2
samba-1862e904a821e2cd6132ab1d13b02da123edd94e.zip
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
-rwxr-xr-xselftest/selftest.pl2
-rw-r--r--selftest/target/Samba3.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 9db3f21bb8..fbb36a2d58 100755
--- 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 b6c851a49d..9b9bec30a2 100644
--- 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);