summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-15 09:43:03 +1000
committerStefan Metzmacher <metze@samba.org>2012-05-15 08:18:27 +0200
commitf67cb32b51a77dd0ebf63d9469a99f9359cb1e54 (patch)
treef38f8fada9c7ee7864178da6dc2f9b5706c6442f /selftest/target
parent747e539ad04f4a4781c388d86f4d6110331a0f3f (diff)
downloadsamba-f67cb32b51a77dd0ebf63d9469a99f9359cb1e54.tar.gz
samba-f67cb32b51a77dd0ebf63d9469a99f9359cb1e54.tar.bz2
samba-f67cb32b51a77dd0ebf63d9469a99f9359cb1e54.zip
selftest: Remove tests for security=server
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'selftest/target')
-rw-r--r--selftest/target/Samba.pm1
-rwxr-xr-xselftest/target/Samba3.pm40
2 files changed, 0 insertions, 41 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 14226036a1..72f26a5edd 100644
--- 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 b148167156..04026bee89 100755
--- 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) = @_;