selftest/Samba3: add 'smbd:suicide mode = yes'

[samba.git] / selftest / target / Samba3.pm

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b148167156c93e31c1cf1acaa89d9f0d01d6d100..d55c6d75b84052c21b19c3d1c910a701ae22d1c9 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) = @_;
@@ -885,6 +845,7 @@ sub provision($$$$$$)
        interfaces = $server_ip/8
        bind interfaces only = yes
        panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+       smbd:suicide mode = yes
 
        workgroup = $domain