selftest: Use new fake_acls module

This isolates us from the OS ACL library, and allows chown to 'work'
when we are non-root.  In turn, this ensures that we can test the SMB
-> POSIX layer even when the OS would refuse the set due to non-root
or simply not having acls enabled on this particular file system.

This should make a number of build farm tests much more reliable, and
allows a number more tests to pass.

Andrew Bartlett

diff --git a/selftest/knownfail b/selftest/knownfail
index 1c72718e0473de540c166d442d1d42b63a4ebe3a..2d33360ce1fc067b54b9e46c004791ef1b1d8c5d 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -43,7 +43,6 @@
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\]
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\]
 ^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
-^samba3.raw.samba3checkfsp.samba3checkfsp\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
 ^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
 ^samba3.raw.acls.generic\(s3dc\) # This fails against smbd
 ^samba3.base.delete.deltest16a
@@ -53,7 +52,6 @@
 # these show that we still have some differences between our system
 # with our internal iconv because it passes except when we bypass our
 # internal iconv modules
-^samba.vfstest.acl.vfstest\(s3dc:local\) #until we get the fake_acls module into selftest
 ^samba4.local.convert_string_handle.system.iconv.gd_ascii
 ^samba4.local.convert_string_handle.system.iconv.gd_iso8859_cp850
 ^samba4..*base.delete.*.deltest17\(
@@ -222,11 +220,7 @@
 # but in the interests of ensuring we do not regress, we run the tests
 # and list the current failures here.
 #
-^samba3.raw.acls.create_file\(plugin_s4_dc\)
-^samba3.raw.acls.create_dir\(plugin_s4_dc\)
 ^samba3.raw.acls.generic\(plugin_s4_dc\)
-^samba3.smb2.create.aclfile\(plugin_s4_dc\)
-^samba3.smb2.create.acldir\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\)
 ^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\)

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 72b9c19c718003faa49ed512af47b0586a973192..31bd15b46460a029b0243a0d60cb2237988076a5 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -905,7 +905,7 @@ sub provision($$$$$$)
        store dos attributes = yes
        create mask = 755
        dos filemode = yes
-       vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+       vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 17afab2e56ad04d064ea6d21d10a08f55f487d50..17f3a32a638539b115b690c263002ace7ff2f90c 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1365,7 +1365,7 @@ sub provision_plugin_s4_dc($$)
        create mask = 755
        dos filemode = yes
 
-        vfs objects = acl_xattr xattr_tdb streams_depot
+        vfs objects = acl_xattr fake_acls xattr_tdb streams_depot
 
         dcerpc endpoint servers = -winreg -srvsvc