selftest: Enable ACL testing against the s3dc environment
authorAndrew Bartlett <abartlet@samba.org>
Tue, 17 Apr 2012 01:56:23 +0000 (11:56 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 1 May 2012 23:00:12 +0000 (01:00 +0200)
Previously, ACL tests were skipped and the correct modules for ACL
testing were not loaded.

The addition of a knownfail entry for raw.samba3* tests is due to an
inconsitancy between the behaviour with and without ACL modules loaded
- posix chown calls appear to be ignored in this mode.

Andrew Bartlett

selftest/knownfail
selftest/skip
selftest/target/Samba3.pm

index 440304f0db06b5e6928168068f05839ed54ad7ac..22e46a19992106490f57f0d00094a99656124335 100644 (file)
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,smb2,bigendian\]
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\]
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\]
-^samba3.raw.composite.appendacl\(s3dc\)# This needs ACL and IDMAP behaviour that smbd cannot provide, including mapping of arbitary sids.
+^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.samba3checkfsp.samba3checkfsp\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.samba3closeerr.samba3closeerr\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
+^samba3.raw.acls.generic\(s3dc\) # This fails against smbd
 # 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
 ^samba3.smb2.create.blob
 ^samba3.smb2.create.open
 ^samba3.smb2.create.leading-slash
-^samba3.smb2.create.aclfile
-^samba3.smb2.create.acldir
-^samba3.smb2.create.nulldacl
 ^samba3.smb2.notify.valid-req
 ^samba3.smb2.notify.dir
 ^samba3.smb2.notify.rec
 ^samba3.smb2.lease.multibreak
 ^samba3.smb2.oplock.batch12
 ^samba3.smb2.oplock.batch20
-^samba3.smb2.acls.CREATOR
 ^samba3.smb2.acls.GENERIC
-^samba3.smb2.acls.OWNER
-^samba3.smb2.acls.INHERITANCE
 ^samba3.smb2.acls.INHERITFLAGS
-^samba3.smb2.acls.DYNAMIC
 ^samba3.smb2.streams.rename
 ^samba3.smb2.streams.rename2
 ^samba3.smb2.streams.attributes
index 68a32a6afaa4d0879797b4e285beb9f501e1a8eb..f2f6b695e86e09d47b6fe463d22e59000c7629e0 100644 (file)
@@ -34,7 +34,6 @@
 ^samba3.smbtorture_s3.*.pipe_number
 ^samba3.smbtorture_s3.LOCAL-DBTRANS #hangs for some reason
 ^samba3.*base.charset
-^samba3.*raw.acls
 ^samba3.*raw.context
 ^samba3.*raw.ioctl
 ^samba3.*raw.qfileinfo
index 077e600df6306074157970c6b08522508ef84ed7..245f3a964cb8f152e9684063f521adea192dcad6 100755 (executable)
@@ -941,7 +941,7 @@ sub provision($$$$$$)
        store dos attributes = yes
        create mask = 755
        dos filemode = yes
-       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+       vfs objects = $vfs_modulesdir_abs/acl_xattr.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