summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-08-09 12:20:54 +0200
committerStefan Metzmacher <metze@samba.org>2011-08-12 12:39:05 +0200
commitda7d22dadeec3bb41da0bd1e49c28ab20e83cf9f (patch)
tree9d7d093da720b3c7f53ff2c9f76b821f444d96f9
parent0d1a7fda1ef5e1358228ab2b5e74b18a877e0732 (diff)
downloadsamba-da7d22dadeec3bb41da0bd1e49c28ab20e83cf9f.tar.gz
samba-da7d22dadeec3bb41da0bd1e49c28ab20e83cf9f.tar.bz2
samba-da7d22dadeec3bb41da0bd1e49c28ab20e83cf9f.zip
selftest:target/Samba4: use the correct configuration in setup_vampire_dc()
This allows "TDB_NO_FSYNC=1 make -j test TESTS=vampire" to work. metze Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--selftest/target/Samba4.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 89faf01fab..1b6db25cbc 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1525,6 +1525,7 @@ sub setup_vampire_dc($$$)
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\"";
$cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\"";
$cmd .= " $samba_tool drs kcc $env->{DC_SERVER}";
+ $cmd .= " $env->{CONFIGURATION}";
$cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
unless (system($cmd) == 0) {
warn("Failed to exec kcc\n$cmd");
@@ -1537,6 +1538,7 @@ sub setup_vampire_dc($$$)
$cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\"";
$cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\"";
$cmd .= " $samba_tool drs replicate $env->{DC_SERVER} $env->{VAMPIRE_DC_SERVER}";
+ $cmd .= " $dc_vars->{CONFIGURATION}";
$cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
# replicate Configuration NC
my $cmd_repl = "$cmd \"CN=Configuration,$base_dn\"";