diff options
Diffstat (limited to 'source4/torture/raw/acls.c')
-rw-r--r-- | source4/torture/raw/acls.c | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 5abe9f23c4..74aefa4af5 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -69,11 +69,11 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.fname = fname; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL; @@ -95,7 +95,7 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC; set.set_secdesc.file.fnum = fnum; - set.set_secdesc.in.secinfo_flags = q.query_secdesc.secinfo_flags; + set.set_secdesc.in.secinfo_flags = q.query_secdesc.in.secinfo_flags; set.set_secdesc.in.sd = sd; status = smb_raw_setfileinfo(cli->tree, &set); @@ -177,13 +177,13 @@ static BOOL test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("querying ACL\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL; @@ -210,9 +210,9 @@ static BOOL test_nttrans_create(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.sec_desc = sd; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; - q.query_secdesc.in.fnum = fnum; + q.query_secdesc.file.fnum = fnum; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); @@ -233,7 +233,7 @@ done: #define CHECK_ACCESS_FLAGS(_fnum, flags) do { \ union smb_fileinfo _q; \ _q.access_information.level = RAW_FILEINFO_ACCESS_INFORMATION; \ - _q.access_information.in.fnum = (_fnum); \ + _q.access_information.file.fnum = (_fnum); \ status = smb_raw_fileinfo(cli->tree, mem_ctx, &_q); \ CHECK_STATUS(status, NT_STATUS_OK); \ if (_q.access_information.out.access_flags != (flags)) { \ @@ -279,12 +279,12 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.fname = fname; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -365,10 +365,10 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FILE_READ_DATA; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, SEC_FILE_READ_DATA| SEC_FILE_READ_ATTRIBUTE); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); printf("try open for generic write\n"); io.ntcreatex.in.access_mask = SEC_GENERIC_WRITE; @@ -379,9 +379,9 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_GENERIC_READ; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, SEC_RIGHTS_FILE_READ); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); printf("set a sec desc allowing generic read by owner\n"); sd = security_descriptor_create(mem_ctx, @@ -426,10 +426,10 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FILE_READ_DATA; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, SEC_FILE_READ_DATA | SEC_FILE_READ_ATTRIBUTE); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); printf("try open for generic write\n"); io.ntcreatex.in.access_mask = SEC_GENERIC_WRITE; @@ -440,8 +440,8 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_GENERIC_READ; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, SEC_RIGHTS_FILE_READ); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, SEC_RIGHTS_FILE_READ); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); printf("put back original sd\n"); @@ -517,12 +517,12 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.fname = fname; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -599,9 +599,9 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, expected_mask | file_mappings[i].specific_bits); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); if (!has_take_ownership_privilege) { continue; @@ -647,9 +647,9 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, expected_mask_anon | file_mappings[i].specific_bits); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); } printf("put back original sd\n"); @@ -679,12 +679,12 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.fname = fname; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -739,9 +739,9 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, expected_mask | dir_mappings[i].specific_bits); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); } printf("put back original sd\n"); @@ -797,12 +797,12 @@ static BOOL test_owner_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.fname = fname; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -855,8 +855,8 @@ static BOOL test_owner_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) bit, expected_bits); } CHECK_STATUS(status, NT_STATUS_OK); - CHECK_ACCESS_FLAGS(io.ntcreatex.out.fnum, bit | SEC_FILE_READ_ATTRIBUTE); - smbcli_close(cli->tree, io.ntcreatex.out.fnum); + CHECK_ACCESS_FLAGS(io.ntcreatex.file.fnum, bit | SEC_FILE_READ_ATTRIBUTE); + smbcli_close(cli->tree, io.ntcreatex.file.fnum); } else { CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); } @@ -1019,12 +1019,12 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -1070,9 +1070,9 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.create_options = 0; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; - q.query_secdesc.in.fnum = fnum2; + q.query_secdesc.file.fnum = fnum2; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); @@ -1113,9 +1113,9 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; - q.query_secdesc.in.fnum = fnum2; + q.query_secdesc.file.fnum = fnum2; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); @@ -1205,11 +1205,11 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; CHECK_ACCESS_FLAGS(fnum2, SEC_RIGHTS_FILE_ALL); - q.query_secdesc.in.fnum = fnum2; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum2; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); smbcli_close(cli->tree, fnum2); @@ -1220,7 +1220,7 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) if (NT_STATUS_IS_OK(status)) { printf("failed: w2k3 ACL bug (allowed open when ACL should deny)\n"); ret = False; - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; smbcli_close(cli->tree, fnum2); } else { CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); @@ -1241,7 +1241,7 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; CHECK_ACCESS_FLAGS(fnum2, SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE); smbcli_close(cli->tree, fnum2); @@ -1262,7 +1262,7 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; CHECK_ACCESS_FLAGS(fnum2, SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE); smbcli_close(cli->tree, fnum2); @@ -1318,12 +1318,12 @@ static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_c status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum = io.ntcreatex.out.fnum; + fnum = io.ntcreatex.file.fnum; printf("get the original sd\n"); q.query_secdesc.level = RAW_FILEINFO_SEC_DESC; - q.query_secdesc.in.fnum = fnum; - q.query_secdesc.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; + q.query_secdesc.file.fnum = fnum; + q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER; status = smb_raw_fileinfo(cli->tree, mem_ctx, &q); CHECK_STATUS(status, NT_STATUS_OK); sd_orig = q.query_secdesc.out.sd; @@ -1355,7 +1355,7 @@ static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_c io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; smbcli_close(cli->tree, fnum2); printf("try and access file with base rights - should be OK\n"); @@ -1363,7 +1363,7 @@ static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_c io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; smbcli_close(cli->tree, fnum2); printf("try and access file with extra rights - should be denied\n"); @@ -1389,7 +1389,7 @@ static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_c io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.ntcreatex.out.fnum; + fnum2 = io.ntcreatex.file.fnum; smbcli_close(cli->tree, fnum2); |