Changeset 989 for vendor/current/selftest

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/selftest

Files:

• knownfail (modified) (2 diffs)
• selftesthelpers.py (modified) (1 diff)
• target/Samba.pm (modified) (1 diff)
• target/Samba3.pm (modified) (10 diffs)
• target/Samba4.pm (modified) (5 diffs)

vendor/current/selftest/knownfail

@@ -212 +212 @@
 ^samba3.smb2.session.*reauth5 # some special anonymous checks?
 ^samba3.smb2.compound.interim2 # wrong return code (STATUS_CANCELLED)
+^samba3.smb2.replay.channel-sequence
 ^samba3.smb2.replay.replay3
 ^samba3.smb2.replay.replay4
 ^samba3.smb2.lock.*replay
+^samba4.smb2.ioctl.compress_notsup.*\(ad_dc_ntvfs\)
 ^samba3.raw.session.*reauth2 # maybe fix this?
 ^samba3.rpc.lsa.secrets.seal # This gives NT_STATUS_LOCAL_USER_SESSION_KEY
@@ -325 +327 @@
 #
 ^samba3.blackbox.rpcclient.*ncacn_np.*with.*connect.*rpcclient # we don't allow auth_level_connect anymore
+#nt-vfs server blocks read with execute access
+^samba4.smb2.read.access
+#ntvfs server blocks copychunk with execute access on read handle
+^samba4.smb2.ioctl.copy_chunk_bad_access

vendor/current/selftest/selftesthelpers.py

@@ -186 +186 @@
 smbcquotas = binpath('smbcquotas')
 smbget = binpath('smbget')
+smbcacls = binpath('smbcacls')

vendor/current/selftest/target/Samba.pm

@@ -297 +297 @@
     $interfaces{"rfc2307member"} = 34;
     $interfaces{"fileserver"} = 35;
+    $interfaces{"s4member_dflt"} = 36;
 
     # update lib/socket_wrapper/socket_wrapper.c

vendor/current/selftest/target/Samba3.pm

@@ -461 +461 @@
         workgroup = $dcvars->{DOMAIN}
         realm = $dcvars->{REALM}
+        idmap config * : backend = autorid
+        idmap config * : range = 1000000-1999999
+        idmap config * : rangesize = 100000
         idmap config $dcvars->{DOMAIN} : backend = rfc2307
         idmap config $dcvars->{DOMAIN} : range = 2000000-2999999
@@ -551 +554 @@
         read only = no
         vfs_aio_fork:erratic_testing_mode=yes
+
+[dosmode]
+        path = $prefix_abs/share
+        vfs objects =
+        store dos attributes = yes
+        hide files = /hidefile/
+        hide dot files = yes
 ";
 
@@ -594 +604 @@
         push(@dirs, "$dfree_share_dir/subdir1");
         push(@dirs, "$dfree_share_dir/subdir2");
+        push(@dirs, "$dfree_share_dir/subdir3");
 
         my $valid_users_sharedir="$share_dir/valid_users";
@@ -1080 +1091 @@
             return undef;
         }
-        print "DONE\n";
 }
 
@@ -1310 +1320 @@
         my ($gid_userdup, $gid_everyone);
         my ($gid_force_user);
-
-        if ($unix_uid < 0xffff - 7) {
+        my ($uid_user1);
+        my ($uid_user2);
+
+        if ($unix_uid < 0xffff - 10) {
                 $max_uid = 0xffff;
         } else {
@@ -1325 +1337 @@
         $uid_force_user = $max_uid - 7;
         $uid_smbget = $max_uid - 8;
+        $uid_user1 = $max_uid - 9;
+        $uid_user2 = $max_uid - 10;
 
         if ($unix_gids[0] < 0xffff - 8) {
@@ -1678 +1692 @@
 [dfq]
         path = $shrdir/dfree
-        vfs objects = fake_dfq
+        vfs objects = acl_xattr fake_acls xattr_tdb fake_dfq
         admin users = $unix_name
         include = $dfqconffile
+[dfq_owner]
+        path = $shrdir/dfree
+        vfs objects = acl_xattr fake_acls xattr_tdb fake_dfq
+        inherit owner = yes
+        include = $dfqconffile
+
+[acl_xattr_ign_sysacl_posix]
+        copy = tmp
+        acl_xattr:ignore system acls = yes
+        acl_xattr:default acl style = posix
+[acl_xattr_ign_sysacl_windows]
+        copy = tmp
+        acl_xattr:ignore system acls = yes
+        acl_xattr:default acl style = windows
         ";
         close(CONF);
@@ -1706 +1734 @@
 force_user:x:$uid_force_user:$gid_force_user:force user gecos:$prefix_abs:/bin/false
 smbget_user:x:$uid_smbget:$gid_domusers:smbget_user gecos:$prefix_abs:/bin/false
+user1:x:$uid_user1:$gid_nogroup:user1 gecos:$prefix_abs:/bin/false
+user2:x:$uid_user2:$gid_nogroup:user2 gecos:$prefix_abs:/bin/false
 ";
         if ($unix_uid != 0) {
@@ -1780 +1810 @@
         createuser($self, "force_user", $password, $conffile) || die("Unable to create force_user");
         createuser($self, "smbget_user", $password, $conffile) || die("Unable to create smbget_user");
+        createuser($self, "user1", $password, $conffile) || die("Unable to create user1");
+        createuser($self, "user2", $password, $conffile) || die("Unable to create user2");
 
         open(DNS_UPDATE_LIST, ">$prefix/dns_update_list") or die("Unable to open $$prefix/dns_update_list");
@@ -1785 +1817 @@
         print DNS_UPDATE_LIST "AAAA $server. $server_ipv6\n";
         close(DNS_UPDATE_LIST);
+
+        print "DONE\n";
 
         $ret{SERVER_IP} = $server_ip;

vendor/current/selftest/target/Samba4.pm

@@ -937 +937 @@
 }
 
-sub provision_s4member($$$)
-{
-        my ($self, $prefix, $dcvars) = @_;
-        print "PROVISIONING MEMBER...";
+sub provision_s4member($$$$$)
+{
+        my ($self, $prefix, $dcvars, $hostname, $more_conf) = @_;
+        print "PROVISIONING MEMBER...\n";
         my $extra_smb_conf = "
         passdb backend = samba_dsdb
@@ -955 +955 @@
 rpc_server:tcpip = no
 ";
+        if ($more_conf) {
+                $extra_smb_conf = $extra_smb_conf . $more_conf . "\n";
+        }
         my $ret = $self->provision($prefix,
                                    "member server",
-                                   "s4member",
+                                   $hostname,
                                    "SAMBADOMAIN",
                                    "samba.example.com",
@@ -1894 +1897 @@
                 }
                 return $self->setup_subdom_dc("$path/subdom_dc", $self->{vars}->{ad_dc_ntvfs});
+        } elsif ($envname eq "s4member_dflt_domain") {
+                if (not defined($self->{vars}->{ad_dc_ntvfs})) {
+                        $self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
+                }
+                return $self->setup_s4member_dflt_domain("$path/s4member_dflt_domain", $self->{vars}->{ad_dc_ntvfs});
         } elsif ($envname eq "s4member") {
                 if (not defined($self->{vars}->{ad_dc_ntvfs})) {
@@ -1932 +1940 @@
         my ($self, $path, $dc_vars) = @_;
 
-        my $env = $self->provision_s4member($path, $dc_vars);
+        my $env = $self->provision_s4member($path, $dc_vars, "s4member");
 
         if (defined $env) {
@@ -1940 +1948 @@
 
                 $self->{vars}->{s4member} = $env;
+        }
+
+        return $env;
+}
+
+sub setup_s4member_dflt_domain($$$)
+{
+        my ($self, $path, $dc_vars) = @_;
+
+        my $env = $self->provision_s4member($path, $dc_vars, "s4member_dflt",
+                                            "winbind use default domain = yes");
+
+        if (defined $env) {
+                if (not defined($self->check_or_start($env, "standard"))) {
+                        return undef;
+                }
+
+                $self->{vars}->{s4member_dflt_domain} = $env;
         }