The branch, master has been updated
via ca67768... s4:selftest Add file based DNS resolver to selftest
environment
via 8529b0a... selftest: Remove dns_host_file every time we start
from be79f57... Split the dsdb_access_check_on_dn.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ca67768b66758cadcc0e5e2f7544698b41c8f8ba
Author: Andrew Bartlett <[email protected]>
Date: Wed Feb 24 15:09:28 2010 +1100
s4:selftest Add file based DNS resolver to selftest environment
This will in future allow us to test 'net vampire' in the test
environment, using the file based DNS lookups to avoid us hitting real
DNS.
commit 8529b0afc1f56ba29ddcb5a4fdc62790868cfbe6
Author: Andrew Bartlett <[email protected]>
Date: Fri Mar 12 10:45:16 2010 +1100
selftest: Remove dns_host_file every time we start
-----------------------------------------------------------------------
Summary of changes:
selftest/selftest.pl | 3 +++
selftest/target/Samba4.pm | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index f534263..7bbad62 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -853,6 +853,9 @@ sub teardown_env($)
delete $running_envs{$envname};
}
+# This 'global' file needs to be empty when we start
+unlink("$prefix_abs/dns_host_file");
+
if ($opt_no_lazy_setup) {
setup_env($_) foreach (keys %required_envs);
}
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 7a65847..9370a17 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -458,6 +458,9 @@ sub provision_raw_prepare($$$$$$$)
$ctx->{prefix} = $prefix;
$ctx->{prefix_abs} = $prefix_abs;
+
+ $ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file";
+
$ctx->{server_role} = $server_role;
$ctx->{netbiosname} = $netbiosname;
$ctx->{netbiosalias} = $netbiosalias;
@@ -569,7 +572,7 @@ sub provision_raw_step1($$)
winbindd privileged socket directory =
$ctx->{winbindd_privileged_socket_dir}
ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
winbind separator = /
- name resolve order = bcast
+ name resolve order = bcast file
interfaces = $ctx->{interfaces}
tls dh params file = $ctx->{tlsdir}/dhparms.pem
panic action = $RealBin/gdb_backtrace \%PID% \%PROG%
@@ -582,7 +585,8 @@ sub provision_raw_step1($$)
log level = $ctx->{server_loglevel}
lanman auth = Yes
rndc command = /bin/true
- dns update command = /bin/true
+ dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate -s
$ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}
+ resolv:host file = $ctx->{dns_host_file}
";
if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne
"internal") {
--
Samba Shared Repository
