selftest: fix domain name of nt4_dc_smb1 environment

It had the same workgroup as the nt4_dc environment:

$ grep workgroup st/nt4_dc/lib/server.conf st/nt4_dc_smb1/lib/server.conf
st/nt4_dc/lib/server.conf:      workgroup = SAMBA-TEST
st/nt4_dc_smb1/lib/server.conf: workgroup = SAMBA-TEST

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15533

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 5b3d31ea53567bda02fee6ba8d90ad820a449f7c..e1e6dc512c1fafe66f83aab8d2b032e18ae33854 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -262,7 +262,7 @@ sub check_env($$)
 
 sub setup_nt4_dc
 {
-       my ($self, $path, $more_conf, $server) = @_;
+       my ($self, $path, $more_conf, $domain, $server) = @_;
 
        print "PROVISIONING NT4 DC...";
 
@@ -312,12 +312,15 @@ sub setup_nt4_dc
        if (defined($more_conf)) {
                $nt4_dc_options = $nt4_dc_options . $more_conf;
        }
+       if (!defined($domain)) {
+               $domain = "SAMBA-TEST";
+       }
        if (!defined($server)) {
                $server = "LOCALNT4DC2";
        }
        my $vars = $self->provision(
            prefix => $path,
-           domain => "SAMBA-TEST",
+           domain => $domain,
            server => $server,
            password => "localntdc2pass",
            extra_options => $nt4_dc_options);
@@ -352,7 +355,7 @@ sub setup_nt4_dc_smb1
        client min protocol = CORE
        server min protocol = LANMAN1
 ";
-       return $self->setup_nt4_dc($path, $conf, "LCLNT4DC2SMB1");
+       return $self->setup_nt4_dc($path, $conf, "NT4SMB1", "LCLNT4DC2SMB1");
 }
 
 sub setup_nt4_dc_smb1_done