s4:selftest Fix 'net vampire' command invocation

The change to allowing subcommands in 'net' to use their own options
parser means that we can't use this argument order any more.  We need
to put global options before commands.

Andrew Bartlett

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