diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 04:17:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:16 -0500 |
| commit | 8692564e350db4dfa4a9ef4c4cb014d76b284d3b (patch) | |
| tree | 891fbe0b3b55c4b7706bdb6ad8cd85c59cd070e2 /source4/torture/gentest.c | |
| parent | 5011f901aa0140ed60a0b58e80ab0f14810ba432 (diff) | |
| download | samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.gz samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.bz2 samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.zip | |
r3458: more solaris portability fixes, the main one being that we can't use a
structure element called "open" as its a macro on solaris.
(This used to be commit 4e92e15c4e396b1d8cd211192888fea68c2cf0f9)
Diffstat (limited to 'source4/torture/gentest.c')
| -rw-r--r-- | source4/torture/gentest.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 583cec5b45..cce831e6c6 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -1085,27 +1085,27 @@ static BOOL handler_open(int instance) union smb_open parm[NSERVERS]; NTSTATUS status[NSERVERS]; - parm[0].open.level = RAW_OPEN_OPEN; - parm[0].open.in.flags = gen_bits_mask2(0xF, 0xFFFF); - parm[0].open.in.search_attrs = gen_attrib(); - parm[0].open.in.fname = gen_fname_open(instance); + parm[0].openold.level = RAW_OPEN_OPEN; + parm[0].openold.in.flags = gen_bits_mask2(0xF, 0xFFFF); + parm[0].openold.in.search_attrs = gen_attrib(); + parm[0].openold.in.fname = gen_fname_open(instance); if (!options.use_oplocks) { /* mask out oplocks */ - parm[0].open.in.flags &= ~(OPENX_FLAGS_REQUEST_OPLOCK| + parm[0].openold.in.flags &= ~(OPENX_FLAGS_REQUEST_OPLOCK| OPENX_FLAGS_REQUEST_BATCH_OPLOCK); } GEN_COPY_PARM; GEN_CALL(smb_raw_open(tree, current_op.mem_ctx, &parm[i])); - CHECK_EQUAL(open.out.attrib); - CHECK_TIMES_EQUAL(open.out.write_time); - CHECK_EQUAL(open.out.size); - CHECK_EQUAL(open.out.rmode); + CHECK_EQUAL(openold.out.attrib); + CHECK_TIMES_EQUAL(openold.out.write_time); + CHECK_EQUAL(openold.out.size); + CHECK_EQUAL(openold.out.rmode); /* open creates a new file handle */ - ADD_HANDLE(parm[0].open.in.fname, open.out.fnum); + ADD_HANDLE(parm[0].openold.in.fname, openold.out.fnum); return True; } |