sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4/torture: fix RAW-OPLOCK-STREAM1 test after commit a11bb14

Browse Source 
We were pulling junk memory for our stream names after the reordering
of the struct definition.
This commit is contained in:
Steven Danneman 2009-09-29 19:03:20 -07:00
parent 8c0d239317
commit 9af9dbeaf3
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source4/torture/raw/oplock.c
View File

@ -2967,25 +2967,25 @@ static bool test_raw_oplock_stream1(struct torture_context *tctx,
NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK | NTCREATEX_FLAGS_EXTENDED;
uint32_t exclusive_req = NTCREATEX_FLAGS_REQUEST_OPLOCK |
NTCREATEX_FLAGS_EXTENDED;
/* Try some permutations of taking oplocks on streams. */
#define NSTREAM_OPLOCK_RESULTS 8
struct {
const char *fname;
const char **fname;
bool open_base_file;
uint32_t oplock_req;
uint32_t oplock_granted;
} stream_oplock_results[NSTREAM_OPLOCK_RESULTS] = {
/* Request oplock on stream without the base file open. */
{fname_stream, false, batch_req, NO_OPLOCK_RETURN},
{fname_default_stream, false, batch_req, NO_OPLOCK_RETURN},
{fname_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
{fname_default_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
{&fname_stream, false, batch_req, NO_OPLOCK_RETURN},
{&fname_default_stream, false, batch_req, NO_OPLOCK_RETURN},
{&fname_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
{&fname_default_stream, false, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
/* Request oplock on stream with the base file open. */
{fname_stream, true, batch_req, NO_OPLOCK_RETURN},
{fname_default_stream, true, batch_req, NO_OPLOCK_RETURN},
{fname_stream, true, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
{fname_default_stream, true, exclusive_req, LEVEL_II_OPLOCK_RETURN},
{&fname_stream, true, batch_req, NO_OPLOCK_RETURN},
{&fname_default_stream, true, batch_req, NO_OPLOCK_RETURN},
{&fname_stream, true, exclusive_req, EXCLUSIVE_OPLOCK_RETURN},
{&fname_default_stream, true, exclusive_req, LEVEL_II_OPLOCK_RETURN},
};
@ -3032,8 +3032,9 @@ static bool test_raw_oplock_stream1(struct torture_context *tctx,
/* Change the disposition to open now that the file has been created. */
io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
/* Try some permutations of taking oplocks on streams. */
for (i = 0; i < NSTREAM_OPLOCK_RESULTS; i++) {
const char *fname = stream_oplock_results[i].fname;
const char *fname = *stream_oplock_results[i].fname;
bool open_base_file = stream_oplock_results[i].open_base_file;
uint32_t oplock_req = stream_oplock_results[i].oplock_req;
uint32_t oplock_granted =