diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-10-15 18:26:19 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-10-15 20:03:00 +1100 |
commit | 3c028ff88b7f8b4a19a058ee44aeb42c10f4b398 (patch) | |
tree | ddac33c24d3f8c62c98e512fcbd240d1a094f5ca /source4/torture/raw/streams.c | |
parent | c73ba89112dda50e1828e11c87f8006bc4968546 (diff) | |
download | samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.tar.gz samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.tar.bz2 samba-3c028ff88b7f8b4a19a058ee44aeb42c10f4b398.zip |
s4-smb: declare root_fid as a file handle
In order to implement root_fid in the s4 SMB server we need to declare
it as a handle type, just as for other fnum values in SMB. This
required some extensive (but simple) changes in many bits of code.
Diffstat (limited to 'source4/torture/raw/streams.c')
-rw-r--r-- | source4/torture/raw/streams.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index 6c5dc85a10..5c6bd63157 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -221,7 +221,7 @@ static bool test_stream_dir(struct torture_context *tctx, printf("(%s) opening non-existant directory stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; @@ -237,7 +237,7 @@ static bool test_stream_dir(struct torture_context *tctx, printf("(%s) opening basedir stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; @@ -253,7 +253,7 @@ static bool test_stream_dir(struct torture_context *tctx, printf("(%s) opening basedir ::$DATA stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0x10; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -297,7 +297,7 @@ static bool test_stream_io(struct torture_context *tctx, printf("(%s) creating a stream on a non-existant file\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -434,7 +434,7 @@ static bool test_stream_sharemodes(struct torture_context *tctx, printf("(%s) testing stream share mode conflicts\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -523,7 +523,7 @@ static bool test_stream_delete(struct torture_context *tctx, printf("(%s) opening non-existant file stream\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -698,7 +698,7 @@ static bool test_stream_names(struct torture_context *tctx, printf("(%s) testing stream names\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -966,7 +966,7 @@ static bool test_stream_names2(struct torture_context *tctx, printf("(%s) testing stream names\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_WRITE_DATA; io.ntcreatex.in.create_options = 0; @@ -1060,7 +1060,7 @@ static bool test_stream_rename(struct torture_context *tctx, printf("(%s) testing stream renames\n", __location__); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = SEC_FILE_READ_ATTRIBUTE | SEC_FILE_WRITE_ATTRIBUTE | @@ -1135,7 +1135,7 @@ static bool test_stream_rename2(struct torture_context *tctx, sname2 = talloc_asprintf(mem_ctx, "%s:%s", fname1, "Stream Two"); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = (SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA| SEC_STD_DELETE|SEC_FILE_APPEND_DATA|SEC_STD_READ_CONTROL); @@ -1318,7 +1318,7 @@ static bool create_file_with_stream(struct torture_context *tctx, /* Create a file with a stream */ io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = (SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA| SEC_FILE_APPEND_DATA|SEC_STD_READ_CONTROL); @@ -1365,7 +1365,7 @@ static bool test_stream_create_disposition(struct torture_context *tctx, /* Open the base file with OPEN */ io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = (SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA| SEC_FILE_APPEND_DATA|SEC_STD_READ_CONTROL); @@ -1573,7 +1573,7 @@ static bool test_stream_attributes(struct torture_context *tctx, /* Now open the stream name. */ io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.flags = 0; io.ntcreatex.in.access_mask = (SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA| SEC_FILE_APPEND_DATA|SEC_STD_READ_CONTROL|SEC_FILE_WRITE_ATTRIBUTE); |