diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-12-07 17:19:30 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-12-07 17:59:28 -0800 |
| commit | 1bf825b6f8df8b37816350ad670a5955025eb788 (patch) | |
| tree | 3a4627396c22b09fc01cccdf3bcc992cde92e49c | |
| parent | 978dc61b5682a9a3cc27474f22b94ea9745ad838 (diff) | |
| download | samba-1bf825b6f8df8b37816350ad670a5955025eb788.tar.gz samba-1bf825b6f8df8b37816350ad670a5955025eb788.tar.bz2 samba-1bf825b6f8df8b37816350ad670a5955025eb788.zip | |
s4 torture: Cleanup RAW-ACLS a bit
Don't check SEC_DESC_DACL_AUTO_INHERITED right now
Disable RAW-ACLS-INHERITFLAGS for the short term
Update samba4's knownfail accordingly
| -rw-r--r-- | source4/selftest/knownfail | 1 | ||||
| -rw-r--r-- | source4/torture/raw/acls.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index 9d52df1d78..93a9f38cd2 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -74,7 +74,6 @@ samba4.raw.streams.*.CREATEDISP samba4.raw.streams.*.SUMTAB samba4.raw.acls.*.CREATE_DIR samba4.raw.acls.*.CREATE_FILE -samba4.raw.acls.*.INHERITFLAGS samba4.smb2.create.*.ACLDIR samba4.smb2.acls.*.GENERIC samba4.smb2.acls.*.INHERITFLAGS diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index e34a901ebc..82eaba459d 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -82,7 +82,8 @@ static bool verify_sd(TALLOC_CTX *tctx, struct smbcli_state *cli, status = smb_raw_fileinfo(cli->tree, tctx, &q); CHECK_STATUS(status, NT_STATUS_OK); - /* sd->type &= ~SEC_DESC_DACL_AUTO_INHERITED; */ + /* More work is needed if we're going to check this bit. */ + sd->type &= ~SEC_DESC_DACL_AUTO_INHERITED; CHECK_SECURITY_DESCRIPTOR(q.query_secdesc.out.sd, sd); } @@ -2447,7 +2448,8 @@ struct torture_suite *torture_raw_acls(TALLOC_CTX *mem_ctx) torture_suite_add_1smb_test(suite, "GENERIC", test_generic_bits); torture_suite_add_1smb_test(suite, "OWNER", test_owner_bits); torture_suite_add_1smb_test(suite, "INHERITANCE", test_inheritance); - torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); + + /* torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); */ torture_suite_add_1smb_test(suite, "DYNAMIC", test_inheritance_dynamic); /* XXX This test does not work against XP or Vista. torture_suite_add_1smb_test(suite, "GETSET", test_sd_get_set); |