s4/selftest: Fix 'net vampire' command invocation

- 'net vampire' no longer accepts '--realm' option
 - 'vampire' command must follow 'bin/net' on command line
so that Python commands are searched for 'vampire' command
 - '--target-dir' option must be used

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 682023762401450b47ba166c0ef6afa250f2122e..67ef3399035aa986608614be2474948f8589bf44 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -941,9 +941,10 @@ sub provision_vampire_dc($$$)
        my $cmd = "";
        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
-       $cmd .= "$net $ret->{CONFIGURATION} --realm=$dcvars->{REALM}";
+       $cmd .= "$net vampire $dcvars->{DOMAIN}";
        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
-       $cmd .= " vampire $dcvars->{DOMAIN}";
+       $cmd .= " $ret->{CONFIGURATION}";
+       $cmd .= " --target-dir=\"$prefix\"";
 
        system($cmd) == 0 or die("Join failed\n$cmd");