From e981b41a37c78de1d7ad114921f65502a365dd66 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 7 Sep 2017 17:29:03 +0200 Subject: [PATCH] selftest: run raw.acls tests against a share with XDR NFS4 ACLs Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- selftest/knownfail | 6 ++++++ selftest/target/Samba3.pm | 8 ++++++++ source3/selftest/tests.py | 1 + 3 files changed, 15 insertions(+) diff --git a/selftest/knownfail b/selftest/knownfail index 36c1697f9a4..1791614fc90 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -34,6 +34,12 @@ ^samba3.raw.acls nfs4acl_xattr-special-40.nulldacl\(nt4_dc\) ^samba3.raw.acls nfs4acl_xattr-special-40.inherit_creator_owner\(nt4_dc\) ^samba3.raw.acls nfs4acl_xattr-special-40.inherit_creator_group\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.INHERITFLAGS\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_file\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_dir\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.nulldacl\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_owner\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_group\(nt4_dc\) ^samba3.base.delete.deltest16a ^samba3.base.delete.deltest17a ^samba3.unix.whoami anonymous connection.whoami\(ad_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 57db4fa1c60..248075ddffa 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1882,6 +1882,14 @@ sub provision($$$$$$$$$) nfs4:mode = simple vfs objects = nfs4acl_xattr xattr_tdb +[nfs4acl_xdr_40] + path = $shrdir + comment = smb username is [%U] + vfs objects = nfs4acl_xattr xattr_tdb + nfs4:mode = simple + nfs4acl_xattr:encoding = xdr + nfs4acl_xattr:version = 40 + [xcopy_share] path = $shrdir comment = smb username is [%U] diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 4dc7f753fb5..e2a8b7a4db5 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -464,6 +464,7 @@ for t in tests: plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-40') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_special_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special-40') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-41') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_xdr_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-40') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') elif t == "smb2.ioctl": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific') -- 2.34.1