selftest: Remove tests for security=server

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 14226036a1b4c13809022e0e188c77646da5248f..72f26a5edd68f46c524d4ebcab549a3b96960680 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -144,7 +144,6 @@ sub get_interface($)
     $interfaces{"locals3dc2"} = 2;
     $interfaces{"localmember3"} = 3;
     $interfaces{"localshare4"} = 4;
-    $interfaces{"localserver5"} = 5;
     $interfaces{"localktest6"} = 6;
     $interfaces{"maptoguest"} = 7;
 

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b148167156c93e31c1cf1acaa89d9f0d01d6d100..04026bee89f1b35c08d59f5e73b5fb25d5846601 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -159,13 +159,6 @@ sub setup_env($$$)
                return $self->setup_maptoguest("$path/maptoguest");
        } elsif ($envname eq "ktest") {
                return $self->setup_ktest("$path/ktest");
-       } elsif ($envname eq "secserver") {
-               if (not defined($self->{vars}->{s3dc})) {
-                       if (not defined($self->setup_s3dc("$path/s3dc"))) {
-                               return undef;
-                       }
-               }
-               return $self->setup_secserver("$path/secserver", $self->{vars}->{s3dc});
        } elsif ($envname eq "member") {
                if (not defined($self->{vars}->{s3dc})) {
                        if (not defined($self->setup_s3dc("$path/s3dc"))) {
@@ -375,39 +368,6 @@ sub setup_secshare($$)
        return $vars;
 }
 
-sub setup_secserver($$$)
-{
-       my ($self, $prefix, $s3dcvars) = @_;
-
-       print "PROVISIONING server with security=server...";
-
-       my $secserver_options = "
-       security = server
-        password server = $s3dcvars->{SERVER_IP}
-";
-
-       my $ret = $self->provision($prefix,
-                                  "LOCALSERVER5",
-                                  "localserver5pass",
-                                  $secserver_options);
-
-       $ret or return undef;
-
-       $self->check_or_start($ret, "yes", "no", "yes");
-
-       if (not $self->wait_for_start($ret)) {
-              return undef;
-       }
-
-       $ret->{DC_SERVER} = $s3dcvars->{SERVER};
-       $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP};
-       $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME};
-       $ret->{DC_USERNAME} = $s3dcvars->{USERNAME};
-       $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD};
-
-       return $ret;
-}
-
 sub setup_ktest($$$)
 {
        my ($self, $prefix) = @_;

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 0682f8bad42c4e74ea759b7b3c837fe8eeb2d8b5..bcd9ae8524a1c195defbc540206cbd51ad2a1e17 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -165,10 +165,7 @@ plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [o
 plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration])
 
 
-for env in ["secserver"]:
-    plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) domain creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN\\\\$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no"])
-
-for env in ["maptoguest", "secshare", "secserver"]:
+for env in ["maptoguest", "secshare"]:
     plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
 
 env = "maptoguest"