selftest: rename env s3dc_schannel to nt4_dc_schannel

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 524c2ef4b3d92b8cb9fd6a197a7e4c98a0ea8a4c..e59708dad9705125d29625ae0fce4203604eee41 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -164,7 +164,7 @@ sub get_interface($)
 
     $interfaces{"localktest6"} = 7;
     $interfaces{"maptoguest"} = 8;
-    $interfaces{"locals3dc9"} = 9;
+    $interfaces{"localnt4dc9"} = 9;
 
     # 11-16 used by selftest.pl for client interfaces
 

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 23d00aa97ebdfa15026e841571ac06a5c285a4db..adf833b684248305b583b7d48995e95578b0ce60 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -175,8 +175,8 @@ sub setup_env($$$)
 
        if ($envname eq "nt4_dc") {
                return $self->setup_nt4_dc("$path/nt4_dc");
-       } elsif ($envname eq "s3dc_schannel") {
-               return $self->setup_s3dc_schannel("$path/s3dc_schannel");
+       } elsif ($envname eq "nt4_dc_schannel") {
+               return $self->setup_nt4_dc_schannel("$path/nt4_dc_schannel");
        } elsif ($envname eq "simpleserver") {
                return $self->setup_simpleserver("$path/simpleserver");
        } elsif ($envname eq "maptoguest") {
@@ -241,11 +241,11 @@ sub setup_nt4_dc($$)
        return $vars;
 }
 
-sub setup_s3dc_schannel($$)
+sub setup_nt4_dc_schannel($$)
 {
        my ($self, $path) = @_;
 
-       print "PROVISIONING S3DC WITH SERVER SCHANNEL ...";
+       print "PROVISIONING NT4 DC WITH SERVER SCHANNEL ...";
 
        my $pdc_options = "
        domain master = yes
@@ -267,8 +267,8 @@ sub setup_s3dc_schannel($$)
 ";
 
        my $vars = $self->provision($path,
-                                   "LOCALS3DC9",
-                                   "locals3dc9pass",
+                                   "LOCALNT4DC9",
+                                   "localntdc9pass",
                                    $pdc_options);
 
        $vars or return undef;
@@ -284,7 +284,7 @@ sub setup_s3dc_schannel($$)
        $vars->{DC_USERNAME} = $vars->{USERNAME};
        $vars->{DC_PASSWORD} = $vars->{PASSWORD};
 
-       $self->{vars}->{s3dc_schannel} = $vars;
+       $self->{vars}->{nt4_dc_schannel} = $vars;
 
        return $vars;
 }

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index a571f34cd47b091e1f6a98fa747ab9724be606ee..1b28a151ab3e6699caebb9bfb6710095d9b06f7c 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -376,7 +376,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:share1=vfs_fruit --option=torture:share2=tmp --option=torture:localdir=$SELFTEST_PREFIX/ad_dc/share')
     elif t == "rpc.schannel_anon_setpw":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$%', description="anonymous password set")
-        plansmbtorture4testsuite(t, "s3dc_schannel", '//$SERVER_IP/tmp -U$%', description="anonymous password set (schannel enforced server-side)")
+        plansmbtorture4testsuite(t, "nt4_dc_schannel", '//$SERVER_IP/tmp -U$%', description="anonymous password set (schannel enforced server-side)")
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$%', description="anonymous password set")
     elif t == "local.nss":
         for env in ["nt4_dc:local", "ad_member:local", "member:local", "ad_dc:local", "ad_dc_ntvfs:local"]: