The xcopy test is used in unusual ways (via a different uid). Ensure we can cope...

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

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
old mode 100644 (file)
new mode 100755 (executable)
index 505130f..3c0fbe9
--- 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") {
@@ -231,7 +233,7 @@ sub setup_admember($$$$)
        $ctx->{realm} = $dcvars->{REALM};
        $ctx->{dnsname} = lc($dcvars->{REALM});
        $ctx->{kdc_ipv4} = $dcvars->{SERVER_IP};
-       Samba::mk_krb5_conf($ctx);
+       Samba::mk_krb5_conf($ctx, "");
 
        $ret->{KRB5_CONFIG} = $ctx->{krb5_conf};
 
@@ -278,14 +280,39 @@ sub setup_plugin_s4_dc($$$$)
        my $plugin_s4_dc_options = "
         workgroup = $dcvars->{DOMAIN}
         realm = $dcvars->{REALM}
-        security=ads
+
+        security = ads
+        domain logons = yes
         passdb backend = samba4
         auth methods = guest samba4
-        domain logons = yes
+        server signing = on
+
+        rpc_server:epmapper = disabled
+        rpc_server:rpcecho = disabled
+        rpc_server:dssetup = disabled
+        rpc_server:svctl = disabled
+        rpc_server:ntsvcs = disabled
+        rpc_server:eventlog = disabled
+        rpc_server:initshutdown = disabled
+
+        rpc_server:winreg = embedded
+        rpc_server:srvsvc = embedded
+        rpc_server:netdfs = embedded
+        rpc_server:wkssvc = embedded
+        rpc_server:spoolss = embedded
+
         rpc_server:lsarpc = external
         rpc_server:netlogon = external
         rpc_server:samr = external
-       server signing = on
+
+        rpc_daemon:epmd = disabled
+        rpc_daemon:lsasd = disabled
+        rpc_daemon:spoolssd = disabled
+
+        rpc_server:tcpip = no
+
+[IPC\$]
+       vfs objects = dfs_samba4
 ";
 
        my $ret = $self->provision($prefix,
@@ -307,7 +334,7 @@ sub setup_plugin_s4_dc($$$$)
        chmod 0777, "$prefix/share";
 
        $self->check_or_start($ret,
-                             "no", "yes", "yes");
+                             "no", "no", "yes");
 
        $self->wait_for_start($ret);
 
@@ -410,7 +437,7 @@ sub setup_ktest($$$)
        $ctx->{realm} = "KTEST.SAMBA.EXAMPLE.COM";
        $ctx->{dnsname} = lc($ctx->{realm});
        $ctx->{kdc_ipv4} = "0.0.0.0";
-       Samba::mk_krb5_conf($ctx);
+       Samba::mk_krb5_conf($ctx, "");
 
        $ret->{KRB5_CONFIG} = $ctx->{krb5_conf};
 
@@ -470,6 +497,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: $!");
@@ -499,7 +556,7 @@ sub read_pid($$)
        return $pid;
 }
 
-sub check_or_start($$$$) {
+sub check_or_start($$$$$) {
        my ($self, $env_vars, $nmbd, $winbindd, $smbd) = @_;
 
        unlink($env_vars->{NMBD_TEST_LOG});
@@ -519,6 +576,8 @@ sub check_or_start($$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
+               $ENV{UID_WRAPPER} = "1";
+
                if ($nmbd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
                                my $signame = shift;
@@ -563,6 +622,8 @@ sub check_or_start($$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
+               $ENV{UID_WRAPPER} = "1";
+
                if ($winbindd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
                                my $signame = shift;
@@ -585,7 +646,7 @@ sub check_or_start($$$$) {
                        @preargs = split(/ /, $ENV{WINBINDD_VALGRIND});
                }
 
-               print "Starting winbindd with config $env_vars->{SERVERCONFFILE})\n";
+               print "Starting winbindd with config $env_vars->{SERVERCONFFILE}\n";
 
                exec(@preargs, Samba::bindir_path($self, "winbindd"), "-F", "--no-process-group", "--stdout", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
        }
@@ -609,6 +670,8 @@ sub check_or_start($$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
+               $ENV{UID_WRAPPER} = "1";
+
                if ($smbd ne "yes") {
                        $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
                                my $signame = shift;
@@ -853,6 +916,7 @@ sub provision($$$$$$$)
        map readonly = no
        store dos attributes = yes
        create mask = 755
+       dos filemode = yes
        vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
        printing = vlp
@@ -866,10 +930,21 @@ sub provision($$$$$$$)
        lpq cache time = 0
 
        ncalrpc dir = $prefix_abs/ncalrpc
-       rpc_server:epmapper = embedded
+       rpc_server:epmapper = external
+       rpc_server:spoolss = external
+       rpc_server:lsarpc = external
+       rpc_server:samr = external
+       rpc_server:netlogon = external
+       rpc_server:tcpip = yes
+
+       rpc_daemon:epmd = fork
+       rpc_daemon:spoolssd = fork
+       rpc_daemon:lsasd = fork
 
         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
@@ -886,6 +961,7 @@ sub provision($$$$$$$)
        print CONF "
 [tmp]
        path = $shrdir
+        comment = smb username is [%U]
 [tmpguest]
        path = $shrdir
         guest ok = yes
@@ -927,6 +1003,11 @@ sub provision($$$$$$$)
        copy = print1
 [lp]
        copy = print1
+[xcopy_share]
+       path = $shrdir
+       comment = smb username is [%U]
+       create mask = 777
+       force create mode = 777
 [print\$]
        copy = tmp
        ";