s3-torture: Run epmapper as daemon and the tests over ncalrpc.

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

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2f65be4ae3ce108c3f26c5db51c11829255b71ee..418240b061a11ca04525fa35f09e6c84851a4994 100644 (file)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -95,6 +95,8 @@ sub setup_env($$$)
                return $self->setup_s3dc("$path/s3dc");
        } elsif ($envname eq "secshare") {
                return $self->setup_secshare("$path/secshare");
+       } elsif ($envname eq "maptoguest") {
+               return $self->setup_maptoguest("$path/maptoguest");
        } elsif ($envname eq "ktest") {
                return $self->setup_ktest("$path/ktest");
        } elsif ($envname eq "secserver") {
@@ -282,6 +284,8 @@ sub setup_plugin_s4_dc($$$$)
         passdb backend = samba4
         auth methods = guest samba4
         domain logons = yes
+        rpc_server:epmapper = external
+        rpc_server:lsass = external
         rpc_server:lsarpc = external
         rpc_server:netlogon = external
         rpc_server:samr = external
@@ -424,7 +428,11 @@ $ret->{USERNAME} = KTEST\\Administrator
 #Samba4 DC with the same parameters as are being used here.  The
 #domain SID is S-1-5-21-1071277805-689288055-3486227160
 
-       system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
+       if (defined($ENV{BUILD_TDB2})) {
+           system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb2 $prefix/private/secrets.tdb");
+       } else {
+           system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
+       }
        chmod 0600, "$prefix/private/secrets.tdb";
 
 #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:
@@ -466,6 +474,36 @@ $ret->{USERNAME} = KTEST\\Administrator
        return $ret;
 }
 
+sub setup_maptoguest($$)
+{
+       my ($self, $path) = @_;
+
+       print "PROVISIONING maptoguest...";
+
+       my $options = "
+map to guest = bad user
+";
+
+       my $vars = $self->provision($path,
+                                   "maptoguest",
+                                   7,
+                                   "maptoguestpass",
+                                   $options);
+
+       $vars or return undef;
+
+       $self->check_or_start($vars,
+                              "yes", "no", "yes");
+
+       if (not $self->wait_for_start($vars)) {
+              return undef;
+       }
+
+       $self->{vars}->{s3maptoguest} = $vars;
+
+       return $vars;
+}
+
 sub stop_sig_term($$) {
        my ($self, $pid) = @_;
        kill("USR1", $pid) or kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
@@ -862,10 +900,14 @@ sub provision($$$$$$$)
        lpq cache time = 0
 
        ncalrpc dir = $prefix_abs/ncalrpc
-       rpc_server:epmapper = embedded
+       rpc_server:epmapper = daemon
 
         resolv:host file = $dns_host_file
 
+        # The samba3.blackbox.smbclient_s3 test uses this to test that
+        # sending messages works, and that the %m sub works.
+        message command = mv %s $shrdir/message.%m
+
        # Begin extra options
        $extra_options
        # End extra options