diff options
| author | Jeremy Allison <jra@samba.org> | 2012-08-29 15:18:19 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-08-30 11:01:30 -0700 |
| commit | 7c4ae7285152777410c31a429ea590501b1c1fe8 (patch) | |
| tree | 9cdea6dd6bfe708ac5d84b9b85afd67b3eb4ba06 /source4/torture | |
| parent | da670e4830ab487c1f56efbea90b1cf33247938c (diff) | |
| download | samba-7c4ae7285152777410c31a429ea590501b1c1fe8.tar.gz samba-7c4ae7285152777410c31a429ea590501b1c1fe8.tar.xz samba-7c4ae7285152777410c31a429ea590501b1c1fe8.zip | |
Now ACL inheritance flags are working, add test_inheritance_flags() back into raw.acls to ensure we don't regress.
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/acls.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 01ee8be6a9..0342bf9b5d 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -1846,7 +1846,6 @@ done: return ret; } -#if 0 static bool test_inheritance_flags(struct torture_context *tctx, struct smbcli_state *cli) { @@ -1867,7 +1866,7 @@ static bool test_inheritance_flags(struct torture_context *tctx, uint32_t parent_get_ace_inherit; uint32_t child_get_sd_type; uint32_t child_get_ace_inherit; - } tflags[16]; /* 2^4 */ + } tflags[16] = {{0}}; /* 2^4 */ for (i = 0; i < 15; i++) { torture_comment(tctx, "i=%d:", i); @@ -1926,6 +1925,8 @@ static bool test_inheritance_flags(struct torture_context *tctx, torture_comment(tctx, "TESTING ACL INHERITANCE FLAGS\n"); + ZERO_STRUCT(io); + io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; @@ -2072,9 +2073,15 @@ done: smbcli_close(cli->tree, fnum); smb_raw_exit(cli->session); smbcli_deltree(cli->tree, BASEDIR); + + if (!ret) { + torture_result(tctx, + TORTURE_FAIL, "(%s) test_inheritance_flags\n", + __location__); + } + return ret; } -#endif /* test dynamic acl inheritance @@ -2456,9 +2463,7 @@ struct torture_suite *torture_raw_acls(TALLOC_CTX *mem_ctx) torture_suite_add_1smb_test(suite, "owner", test_owner_bits); torture_suite_add_1smb_test(suite, "inheritance", test_inheritance); -#if 0 torture_suite_add_1smb_test(suite, "INHERITFLAGS", test_inheritance_flags); -#endif torture_suite_add_1smb_test(suite, "dynamic", test_inheritance_dynamic); #if 0 /* XXX This test does not work against XP or Vista. */ |