summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
Diffstat (limited to 'selftest')
-rw-r--r--selftest/knownfail12
-rw-r--r--selftest/skip1
-rwxr-xr-xselftest/target/Samba3.pm2
3 files changed, 5 insertions, 10 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 440304f0db..22e46a1999 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -35,7 +35,10 @@
^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
@@ -143,9 +146,6 @@
^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
@@ -179,12 +179,8 @@
^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
diff --git a/selftest/skip b/selftest/skip
index 68a32a6afa..f2f6b695e8 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -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
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 077e600df6..245f3a964c 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -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