diff options
-rw-r--r-- | selftest/knownfail | 8 | ||||
-rwxr-xr-x | selftest/target/Samba3.pm | 6 | ||||
-rwxr-xr-x | source3/selftest/tests.py | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/selftest/knownfail b/selftest/knownfail index cb7630fc63..069afe7604 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -45,6 +45,14 @@ ^samba3.blackbox.smbclient_machine_auth.plain \(s3dc:local\)# the S3dc does not currently set up a self-join ^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # 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 nfs4acl_xattr.INHERITFLAGS\(s3dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet. +^samba3.raw.acls nfs4acl_xattr.dynamic\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.sd\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.create_file\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.create_dir\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.nulldacl\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.generic\(s3dc\) +^samba3.raw.acls nfs4acl_xattr.inheritance\(s3dc\) ^samba3.base.delete.deltest16a ^samba3.base.delete.deltest17a ^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 1b14f1c840..407642c9aa 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1081,6 +1081,12 @@ sub provision($$$$$$) default devmode = no [lp] copy = print1 + +[nfs4acl_share] + path = $shrdir + comment = smb username is [%U] + vfs objects = $vfs_modulesdir_abs/nfs4acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so + [xcopy_share] path = $shrdir comment = smb username is [%U] diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 1c123f5735..11504c0490 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -343,6 +343,10 @@ for t in tests: plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "idmap.rfc2307": plantestsuite(t, "s3member_rfc2307", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_rfc2307.sh"), '$DOMAIN', 'Administrator', '2000000', '"Domain Users"', '2000001', 'ou=idmap,dc=samba,dc=example,dc=com', '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD']) + elif t == "raw.acls": + plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_share -U$USERNAME%$PASSWORD', description='nfs4acl_xattr') + plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') else: plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') |