Changeset 989 for vendor/current/selftest/target/Samba3.pm

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/selftest/target/Samba3.pm (modified) (10 diffs)

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;