Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
[kai/samba.git] / source4 / torture / raw / open.c
index 8a4e09374bab8ae7ac6c8896583722e59069ef59..b6979fa0d9868d6320abbe6c34ab00b11902e5a5 100644 (file)
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "torture/torture.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/raw/raw_proto.h"
+#include "system/time.h"
+#include "system/filesys.h"
+#include "librpc/gen_ndr/security.h"
+#include "lib/events/events.h"
+#include "libcli/libcli.h"
+#include "torture/util.h"
+#include "auth/credentials/credentials.h"
+#include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
@@ -28,11 +39,11 @@ enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
 /*
   check if a open file can be read/written
 */
-static enum rdwr_mode check_rdwr(struct cli_tree *tree, int fnum)
+static enum rdwr_mode check_rdwr(struct smbcli_tree *tree, int fnum)
 {
-       char c = 1;
-       BOOL can_read  = (cli_read(tree, fnum, &c, 0, 1) == 1);
-       BOOL can_write = (cli_write(tree, fnum, 0, &c, 0, 1) == 1);
+       uint8_t c = 1;
+       bool can_read  = (smbcli_read(tree, fnum, &c, 0, 1) == 1);
+       bool can_write = (smbcli_write(tree, fnum, 0, &c, 0, 1) == 1);
        if ( can_read &&  can_write) return RDWR_RDWR;
        if ( can_read && !can_write) return RDWR_RDONLY;
        if (!can_read &&  can_write) return RDWR_WRONLY;
@@ -55,198 +66,198 @@ static const char *rdwr_string(enum rdwr_mode m)
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \
-               printf("(%d) Incorrect status %s - should be %s\n", \
-                      __LINE__, nt_errstr(status), nt_errstr(correct)); \
-               ret = False; \
+               printf("(%s) Incorrect status %s - should be %s\n", \
+                      __location__, nt_errstr(status), nt_errstr(correct)); \
+               ret = false; \
                goto done; \
        }} while (0)
 
 #define CREATE_FILE do { \
-       fnum = create_complex_file(cli, mem_ctx, fname); \
+       fnum = create_complex_file(cli, tctx, fname); \
        if (fnum == -1) { \
-               printf("(%d) Failed to create %s - %s\n", __LINE__, fname, cli_errstr(cli->tree)); \
-               ret = False; \
+               printf("(%s) Failed to create %s - %s\n", __location__, fname, smbcli_errstr(cli->tree)); \
+               ret = false; \
                goto done; \
        }} while (0)
 
 #define CHECK_RDWR(fnum, correct) do { \
        enum rdwr_mode m = check_rdwr(cli->tree, fnum); \
        if (m != correct) { \
-               printf("(%d) Incorrect readwrite mode %s - expected %s\n", \
-                      __LINE__, rdwr_string(m), rdwr_string(correct)); \
-               ret = False; \
+               printf("(%s) Incorrect readwrite mode %s - expected %s\n", \
+                      __location__, rdwr_string(m), rdwr_string(correct)); \
+               ret = false; \
        }} while (0)
 
 #define CHECK_TIME(t, field) do { \
        time_t t1, t2; \
        finfo.all_info.level = RAW_FILEINFO_ALL_INFO; \
-       finfo.all_info.in.fname = fname; \
-       status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); \
+       finfo.all_info.in.file.path = fname; \
+       status = smb_raw_pathinfo(cli->tree, tctx, &finfo); \
        CHECK_STATUS(status, NT_STATUS_OK); \
        t1 = t & ~1; \
        t2 = nt_time_to_unix(finfo.all_info.out.field) & ~1; \
-       if (ABS(t1-t2) > 2) { \
-               printf("(%d) wrong time for field %s  %s - %s\n", \
-                      __LINE__, #field, \
-                      timestring(mem_ctx, t1), \
-                      timestring(mem_ctx, t2)); \
-               dump_all_info(mem_ctx, &finfo); \
-               ret = False; \
+       if (abs(t1-t2) > 2) { \
+               printf("(%s) wrong time for field %s  %s - %s\n", \
+                      __location__, #field, \
+                      timestring(tctx, t1), \
+                      timestring(tctx, t2)); \
+               dump_all_info(tctx, &finfo); \
+               ret = false; \
        }} while (0)
 
 #define CHECK_NTTIME(t, field) do { \
        NTTIME t2; \
        finfo.all_info.level = RAW_FILEINFO_ALL_INFO; \
-       finfo.all_info.in.fname = fname; \
-       status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); \
+       finfo.all_info.in.file.path = fname; \
+       status = smb_raw_pathinfo(cli->tree, tctx, &finfo); \
        CHECK_STATUS(status, NT_STATUS_OK); \
        t2 = finfo.all_info.out.field; \
        if (t != t2) { \
-               printf("(%d) wrong time for field %s  %s - %s\n", \
-                      __LINE__, #field, \
-                      nt_time_string(mem_ctx, t), \
-                      nt_time_string(mem_ctx, t2)); \
-               dump_all_info(mem_ctx, &finfo); \
-               ret = False; \
+               printf("(%s) wrong time for field %s  %s - %s\n", \
+                      __location__, #field, \
+                      nt_time_string(tctx, t), \
+                      nt_time_string(tctx, t2)); \
+               dump_all_info(tctx, &finfo); \
+               ret = false; \
        }} while (0)
 
 #define CHECK_ALL_INFO(v, field) do { \
        finfo.all_info.level = RAW_FILEINFO_ALL_INFO; \
-       finfo.all_info.in.fname = fname; \
-       status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo); \
+       finfo.all_info.in.file.path = fname; \
+       status = smb_raw_pathinfo(cli->tree, tctx, &finfo); \
        CHECK_STATUS(status, NT_STATUS_OK); \
-       if ((v) != finfo.all_info.out.field) { \
-               printf("(%d) wrong value for field %s  0x%x - 0x%x\n", \
-                      __LINE__, #field, (int)v, (int)finfo.all_info.out.field); \
-               dump_all_info(mem_ctx, &finfo); \
-               ret = False; \
+       if ((v) != (finfo.all_info.out.field)) { \
+               printf("(%s) wrong value for field %s  0x%x - 0x%x\n", \
+                      __location__, #field, (int)v, (int)(finfo.all_info.out.field)); \
+               dump_all_info(tctx, &finfo); \
+               ret = false; \
        }} while (0)
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \
-               printf("(%d) wrong value for %s  0x%x - 0x%x\n", \
-                      __LINE__, #v, (int)v, (int)correct); \
-               ret = False; \
+               printf("(%s) wrong value for %s  0x%x - should be 0x%x\n", \
+                      __location__, #v, (int)(v), (int)correct); \
+               ret = false; \
        }} while (0)
 
 #define SET_ATTRIB(sattrib) do { \
        union smb_setfileinfo sfinfo; \
-       sfinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; \
-       sfinfo.generic.file.fname = fname; \
        ZERO_STRUCT(sfinfo.basic_info.in); \
+       sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFORMATION; \
+       sfinfo.basic_info.in.file.path = fname; \
        sfinfo.basic_info.in.attrib = sattrib; \
        status = smb_raw_setpathinfo(cli->tree, &sfinfo); \
        if (!NT_STATUS_IS_OK(status)) { \
-               printf("(%d) Failed to set attrib 0x%x on %s\n", \
-                      __LINE__, sattrib, fname); \
+               printf("(%s) Failed to set attrib 0x%x on %s\n", \
+                      __location__, sattrib, fname); \
        }} while (0)
 
 /*
   test RAW_OPEN_OPEN
 */
-static BOOL test_open(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        union smb_fileinfo finfo;
        const char *fname = BASEDIR "\\torture_open.txt";
        NTSTATUS status;
-       int fnum, fnum2;
-       BOOL ret = True;
+       int fnum = -1, fnum2;
+       bool ret = true;
 
        printf("Checking RAW_OPEN_OPEN\n");
 
-       io.open.level = RAW_OPEN_OPEN;
-       io.open.in.fname = fname;
-       io.open.in.flags = OPEN_FLAGS_FCB;
-       io.open.in.search_attrs = 0;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.level = RAW_OPEN_OPEN;
+       io.openold.in.fname = fname;
+       io.openold.in.open_mode = OPEN_FLAGS_FCB;
+       io.openold.in.search_attrs = 0;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
 
-       cli_unlink(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
        CREATE_FILE;
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
        CHECK_RDWR(fnum, RDWR_RDWR);
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum2 = io.open.out.fnum;
+       fnum2 = io.openold.out.file.fnum;
        CHECK_RDWR(fnum2, RDWR_RDWR);
-       cli_close(cli->tree, fnum2);
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum2);
+       smbcli_close(cli->tree, fnum);
 
        /* check the read/write modes */
-       io.open.level = RAW_OPEN_OPEN;
-       io.open.in.fname = fname;
-       io.open.in.search_attrs = 0;
+       io.openold.level = RAW_OPEN_OPEN;
+       io.openold.in.fname = fname;
+       io.openold.in.search_attrs = 0;
 
-       io.open.in.flags = OPEN_FLAGS_OPEN_READ;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_READ;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
        CHECK_RDWR(fnum, RDWR_RDONLY);
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
 
-       io.open.in.flags = OPEN_FLAGS_OPEN_WRITE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_WRITE;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
        CHECK_RDWR(fnum, RDWR_WRONLY);
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
 
-       io.open.in.flags = OPEN_FLAGS_OPEN_RDWR;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_RDWR;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
        CHECK_RDWR(fnum, RDWR_RDWR);
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
 
        /* check the share modes roughly - not a complete matrix */
-       io.open.in.flags = OPEN_FLAGS_OPEN_RDWR | OPEN_FLAGS_DENY_WRITE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_RDWR | OPEN_FLAGS_DENY_WRITE;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
        CHECK_RDWR(fnum, RDWR_RDWR);
        
-       if (io.open.in.flags != io.open.out.rmode) {
-               printf("(%d) rmode should equal flags - 0x%x 0x%x\n",
-                      __LINE__, io.open.out.rmode, io.open.in.flags);
+       if (io.openold.in.open_mode != io.openold.out.rmode) {
+               printf("(%s) rmode should equal open_mode - 0x%x 0x%x\n",
+                      __location__, io.openold.out.rmode, io.openold.in.open_mode);
        }
 
-       io.open.in.flags = OPEN_FLAGS_OPEN_RDWR | OPEN_FLAGS_DENY_NONE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_RDWR | OPEN_FLAGS_DENY_NONE;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_SHARING_VIOLATION);
 
-       io.open.in.flags = OPEN_FLAGS_OPEN_READ | OPEN_FLAGS_DENY_NONE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_READ | OPEN_FLAGS_DENY_NONE;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum2 = io.open.out.fnum;
+       fnum2 = io.openold.out.file.fnum;
        CHECK_RDWR(fnum2, RDWR_RDONLY);
-       cli_close(cli->tree, fnum);
-       cli_close(cli->tree, fnum2);
+       smbcli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum2);
 
 
        /* check the returned write time */
-       io.open.level = RAW_OPEN_OPEN;
-       io.open.in.fname = fname;
-       io.open.in.search_attrs = 0;
-       io.open.in.flags = OPEN_FLAGS_OPEN_READ;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.openold.level = RAW_OPEN_OPEN;
+       io.openold.in.fname = fname;
+       io.openold.in.search_attrs = 0;
+       io.openold.in.open_mode = OPEN_FLAGS_OPEN_READ;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.open.out.fnum;
+       fnum = io.openold.out.file.fnum;
 
        /* check other reply fields */
-       CHECK_TIME(io.open.out.write_time, write_time);
-       CHECK_ALL_INFO(io.open.out.size, size);
-       CHECK_ALL_INFO(io.open.out.attrib, attrib);
+       CHECK_TIME(io.openold.out.write_time, write_time);
+       CHECK_ALL_INFO(io.openold.out.size, size);
+       CHECK_ALL_INFO(io.openold.out.attrib, attrib & ~FILE_ATTRIBUTE_NONINDEXED);
 
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -255,36 +266,38 @@ done:
 /*
   test RAW_OPEN_OPENX
 */
-static BOOL test_openx(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        union smb_fileinfo finfo;
        const char *fname = BASEDIR "\\torture_openx.txt";
+       const char *fname_exe = BASEDIR "\\torture_openx.exe";
        NTSTATUS status;
-       int fnum, fnum2;
-       BOOL ret = True;
+       int fnum = -1, fnum2;
+       bool ret = true;
        int i;
+       struct timeval tv;
        struct {
                uint16_t open_func;
-               BOOL with_file;
+               bool with_file;
                NTSTATUS correct_status;
        } open_funcs[] = {
-               { OPENX_OPEN_FUNC_OPEN,                           True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_OPEN,                           False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_FAIL,                           True,  NT_STATUS_INVALID_LOCK_SEQUENCE },
-               { OPENX_OPEN_FUNC_FAIL,                           False, NT_STATUS_INVALID_LOCK_SEQUENCE },
-               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OBJECT_NAME_COLLISION },
-               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_TRUNC,                          True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_TRUNC,                          False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_OPEN,                           true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_OPEN,                           false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_FAIL,                           true,  NT_STATUS_DOS(ERRDOS, ERRbadaccess) },
+               { OPENX_OPEN_FUNC_FAIL,                           false, NT_STATUS_DOS(ERRDOS, ERRbadaccess) },
+               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OBJECT_NAME_COLLISION },
+               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC,                          true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC,                          false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
        };
 
        printf("Checking RAW_OPEN_OPENX\n");
-       cli_unlink(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
 
        io.openx.level = RAW_OPEN_OPENX;
        io.openx.in.fname = fname;
@@ -299,113 +312,125 @@ static BOOL test_openx(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        /* check all combinations of open_func */
        for (i=0; i<ARRAY_SIZE(open_funcs); i++) {
                if (open_funcs[i].with_file) {
-                       fnum = create_complex_file(cli, mem_ctx, fname);
+                       fnum = create_complex_file(cli, tctx, fname);
                        if (fnum == -1) {
-                               d_printf("Failed to create file %s - %s\n", fname, cli_errstr(cli->tree));
-                               ret = False;
+                               d_printf("Failed to create file %s - %s\n", fname, smbcli_errstr(cli->tree));
+                               ret = false;
                                goto done;
                        }
-                       cli_close(cli->tree, fnum);
+                       smbcli_close(cli->tree, fnum);
                }
                io.openx.in.open_func = open_funcs[i].open_func;
-               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               status = smb_raw_open(cli->tree, tctx, &io);
                if (!NT_STATUS_EQUAL(status, open_funcs[i].correct_status)) {
-                       printf("(%d) incorrect status %s should be %s (i=%d with_file=%d open_func=0x%x)\n", 
-                              __LINE__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
+                       printf("(%s) incorrect status %s should be %s (i=%d with_file=%d open_func=0x%x)\n", 
+                              __location__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
                               i, (int)open_funcs[i].with_file, (int)open_funcs[i].open_func);
-                       ret = False;
+                       ret = false;
                }
-               if (NT_STATUS_IS_OK(status) || open_funcs[i].with_file) {
-                       cli_close(cli->tree, io.openx.out.fnum);
-                       cli_unlink(cli->tree, fname);
+               if (NT_STATUS_IS_OK(status)) {
+                       smbcli_close(cli->tree, io.openx.out.file.fnum);
+               }
+               if (open_funcs[i].with_file) {
+                       smbcli_unlink(cli->tree, fname);
                }
        }
 
+       smbcli_unlink(cli->tree, fname);
+
        /* check the basic return fields */
        io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.openx.out.fnum;
+       fnum = io.openx.out.file.fnum;
 
        CHECK_ALL_INFO(io.openx.out.size, size);
-       CHECK_VAL(io.openx.out.size, 1024*1024);
-       CHECK_ALL_INFO(io.openx.in.size, size);
        CHECK_TIME(io.openx.out.write_time, write_time);
-       CHECK_ALL_INFO(io.openx.out.attrib, attrib);
+       CHECK_ALL_INFO(io.openx.out.attrib, attrib & ~FILE_ATTRIBUTE_NONINDEXED);
        CHECK_VAL(io.openx.out.access, OPENX_MODE_ACCESS_RDWR);
        CHECK_VAL(io.openx.out.ftype, 0);
        CHECK_VAL(io.openx.out.devstate, 0);
        CHECK_VAL(io.openx.out.action, OPENX_ACTION_CREATED);
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       CHECK_VAL(io.openx.out.size, 1024*1024);
+       CHECK_ALL_INFO(io.openx.in.size, size);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* check the fields when the file already existed */
-       fnum2 = create_complex_file(cli, mem_ctx, fname);
+       fnum2 = create_complex_file(cli, tctx, fname);
        if (fnum2 == -1) {
-               ret = False;
+               ret = false;
                goto done;
        }
-       cli_close(cli->tree, fnum2);
+       smbcli_close(cli->tree, fnum2);
 
        io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.openx.out.fnum;
+       fnum = io.openx.out.file.fnum;
 
        CHECK_ALL_INFO(io.openx.out.size, size);
        CHECK_TIME(io.openx.out.write_time, write_time);
        CHECK_VAL(io.openx.out.action, OPENX_ACTION_EXISTED);
        CHECK_VAL(io.openx.out.unknown, 0);
-       CHECK_ALL_INFO(io.openx.out.attrib, attrib);
-       cli_close(cli->tree, fnum);
+       CHECK_ALL_INFO(io.openx.out.attrib, attrib & ~FILE_ATTRIBUTE_NONINDEXED);
+       smbcli_close(cli->tree, fnum);
 
        /* now check the search attrib for hidden files - win2003 ignores this? */
        SET_ATTRIB(FILE_ATTRIBUTE_HIDDEN);
        CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN, attrib);
 
        io.openx.in.search_attrs = FILE_ATTRIBUTE_HIDDEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       cli_close(cli->tree, io.openx.out.fnum);
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
 
        io.openx.in.search_attrs = 0;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       cli_close(cli->tree, io.openx.out.fnum);
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
 
        SET_ATTRIB(FILE_ATTRIBUTE_NORMAL);
-       cli_unlink(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
 
        /* and check attrib on create */
        io.openx.in.open_func = OPENX_OPEN_FUNC_FAIL | OPENX_OPEN_FUNC_CREATE;
        io.openx.in.search_attrs = 0;
        io.openx.in.file_attrs = FILE_ATTRIBUTE_SYSTEM;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_ALL_INFO(FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE, attrib);
-       cli_close(cli->tree, io.openx.out.fnum);
-       cli_unlink(cli->tree, fname);
+       if (torture_setting_bool(tctx, "samba3", false)) {
+               CHECK_ALL_INFO(FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE, 
+                              attrib & ~(FILE_ATTRIBUTE_NONINDEXED|
+                                         FILE_ATTRIBUTE_SPARSE));
+       }
+       else {
+               CHECK_ALL_INFO(FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE, 
+                              attrib & ~(FILE_ATTRIBUTE_NONINDEXED));
+       }
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* check timeout on create - win2003 ignores the timeout! */
        io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE;
        io.openx.in.file_attrs = 0;
        io.openx.in.open_mode = OPENX_MODE_ACCESS_RDWR | OPENX_MODE_DENY_ALL;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.openx.out.fnum;
+       fnum = io.openx.out.file.fnum;
 
        io.openx.in.timeout = 20000;
-       start_timer();
+       tv = timeval_current();
        io.openx.in.open_mode = OPENX_MODE_ACCESS_RDWR | OPENX_MODE_DENY_NONE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_SHARING_VIOLATION);
-       if (end_timer() > 3) {
-               printf("(%d) Incorrect timing in openx with timeout - waited %d seconds\n",
-                      __LINE__, (int)end_timer());
-               ret = False;
+       if (timeval_elapsed(&tv) > 3.0) {
+               printf("(%s) Incorrect timing in openx with timeout - waited %.2f seconds\n",
+                      __location__, timeval_elapsed(&tv));
+               ret = false;
        }
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* now this is a really weird one - open for execute implies create?! */
        io.openx.in.fname = fname;
@@ -417,21 +442,50 @@ static BOOL test_openx(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.openx.in.write_time = 0;
        io.openx.in.size = 0;
        io.openx.in.timeout = 0;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       cli_close(cli->tree, io.openx.out.fnum);
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
 
        /* check the extended return flag */
        io.openx.in.flags = OPENX_FLAGS_ADDITIONAL_INFO | OPENX_FLAGS_EXTENDED_RETURN;
        io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(io.openx.out.access_mask, STD_RIGHT_ALL_ACCESS);
-       cli_close(cli->tree, io.openx.out.fnum);
+       CHECK_VAL(io.openx.out.access_mask, SEC_STD_ALL);
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
+
+       io.openx.in.fname = "\\A.+,;=[].B";
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+       /* Check the mapping for open exec. */
+
+       /* First create an .exe file. */
+       smbcli_unlink(cli->tree, fname_exe);
+       fnum = create_complex_file(cli, tctx, fname_exe);
+       smbcli_close(cli->tree, fnum);
+
+       io.openx.level = RAW_OPEN_OPENX;
+       io.openx.in.fname = fname_exe;
+       io.openx.in.flags = OPENX_FLAGS_ADDITIONAL_INFO;
+       io.openx.in.open_mode = OPENX_MODE_ACCESS_EXEC | OPENX_MODE_DENY_NONE;
+       io.openx.in.search_attrs = 0;
+       io.openx.in.file_attrs = 0;
+       io.openx.in.write_time = 0;
+       io.openx.in.size = 0;
+       io.openx.in.timeout = 0;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       /* Can we read and write ? */
+       CHECK_RDWR(io.openx.out.file.fnum, RDWR_RDONLY);
+       smbcli_close(cli->tree, io.openx.out.file.fnum);
+       smbcli_unlink(cli->tree, fname);
 
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname_exe);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -440,130 +494,165 @@ done:
 /*
   test RAW_OPEN_T2OPEN
 
-  I can't work out how to get win2003 to accept a create file via TRANS2_OPEN, which
-  is why you see all the ACCESS_DENIED results below. When we finally work this out then this
-  test will make more sense
+  many thanks to kukks for a sniff showing how this works with os2->w2k
 */
-static BOOL test_t2open(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        union smb_fileinfo finfo;
-       const char *fname = BASEDIR "\\torture_t2open.txt";
+       const char *fname1 = BASEDIR "\\torture_t2open_yes.txt";
+       const char *fname2 = BASEDIR "\\torture_t2open_no.txt";
+       const char *fname = BASEDIR "\\torture_t2open_3.txt";
        NTSTATUS status;
        int fnum;
-       BOOL ret = True;
+       bool ret = true;
        int i;
        struct {
                uint16_t open_func;
-               BOOL with_file;
+               bool with_file;
                NTSTATUS correct_status;
        } open_funcs[] = {
-               { OPENX_OPEN_FUNC_OPEN,                           True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_OPEN,                           False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OK },
-               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_ACCESS_DENIED },
-               { OPENX_OPEN_FUNC_FAIL,                           True,  NT_STATUS_OBJECT_NAME_COLLISION },
-               { OPENX_OPEN_FUNC_FAIL,                           False, NT_STATUS_ACCESS_DENIED },
-               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_OBJECT_NAME_COLLISION },
-               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_ACCESS_DENIED },
-               { OPENX_OPEN_FUNC_TRUNC,                          True,  NT_STATUS_ACCESS_DENIED },
-               { OPENX_OPEN_FUNC_TRUNC,                          False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, True,  NT_STATUS_ACCESS_DENIED },
-               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, False, NT_STATUS_ACCESS_DENIED },
+               { OPENX_OPEN_FUNC_OPEN,                           true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_OPEN,                           false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_OPEN  | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_FAIL,                           true,  NT_STATUS_OBJECT_NAME_COLLISION },
+               { OPENX_OPEN_FUNC_FAIL,                           false, NT_STATUS_OBJECT_NAME_COLLISION },
+               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OBJECT_NAME_COLLISION },
+               { OPENX_OPEN_FUNC_FAIL  | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OBJECT_NAME_COLLISION },
+               { OPENX_OPEN_FUNC_TRUNC,                          true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC,                          false, NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, true,  NT_STATUS_OK },
+               { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
        };
 
+       fnum = create_complex_file(cli, tctx, fname1);
+       if (fnum == -1) {
+               d_printf("Failed to create file %s - %s\n", fname1, smbcli_errstr(cli->tree));
+               ret = false;
+               goto done;
+       }
+       smbcli_close(cli->tree, fnum);
+
        printf("Checking RAW_OPEN_T2OPEN\n");
 
        io.t2open.level = RAW_OPEN_T2OPEN;
-       io.t2open.in.fname = fname;
-       io.t2open.in.flags = OPENX_FLAGS_ADDITIONAL_INFO | 
-               OPENX_FLAGS_EA_LEN | OPENX_FLAGS_EXTENDED_RETURN;
+       io.t2open.in.flags = OPENX_FLAGS_ADDITIONAL_INFO;
        io.t2open.in.open_mode = OPENX_MODE_DENY_NONE | OPENX_MODE_ACCESS_RDWR;
        io.t2open.in.open_func = OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE;
+       io.t2open.in.search_attrs = 0;
        io.t2open.in.file_attrs = 0;
        io.t2open.in.write_time = 0;
        io.t2open.in.size = 0;
        io.t2open.in.timeout = 0;
 
-       io.t2open.in.eas = talloc(mem_ctx, sizeof(io.t2open.in.eas[0]));
-       io.t2open.in.num_eas = 1;
+       io.t2open.in.num_eas = 3;
+       io.t2open.in.eas = talloc_array(tctx, struct ea_struct, io.t2open.in.num_eas);
        io.t2open.in.eas[0].flags = 0;
-       io.t2open.in.eas[0].name.s = "EAONE";
-       io.t2open.in.eas[0].value = data_blob_talloc(mem_ctx, "1", 1);
+       io.t2open.in.eas[0].name.s = ".CLASSINFO";
+       io.t2open.in.eas[0].value = data_blob_talloc(tctx, "first value", 11);
+       io.t2open.in.eas[1].flags = 0;
+       io.t2open.in.eas[1].name.s = "EA TWO";
+       io.t2open.in.eas[1].value = data_blob_talloc(tctx, "foo", 3);
+       io.t2open.in.eas[2].flags = 0;
+       io.t2open.in.eas[2].name.s = "X THIRD";
+       io.t2open.in.eas[2].value = data_blob_talloc(tctx, "xy", 2);
 
        /* check all combinations of open_func */
        for (i=0; i<ARRAY_SIZE(open_funcs); i++) {
+       again:
                if (open_funcs[i].with_file) {
-                       fnum = create_complex_file(cli, mem_ctx, fname);
-                       if (fnum == -1) {
-                               d_printf("Failed to create file %s - %s\n", fname, cli_errstr(cli->tree));
-                               ret = False;
-                               goto done;
-                       }
-                       cli_close(cli->tree, fnum);
+                       io.t2open.in.fname = fname1;
+               } else {
+                       io.t2open.in.fname = fname2;
                }
                io.t2open.in.open_func = open_funcs[i].open_func;
-               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               status = smb_raw_open(cli->tree, tctx, &io);
+               if ((io.t2open.in.num_eas != 0)
+                   && NT_STATUS_EQUAL(status, NT_STATUS_EAS_NOT_SUPPORTED)
+                   && torture_setting_bool(tctx, "samba3", false)) {
+                       printf("(%s) EAs not supported, not treating as fatal "
+                              "in Samba3 test\n", __location__);
+                       io.t2open.in.num_eas = 0;
+                       goto again;
+               }
+
                if (!NT_STATUS_EQUAL(status, open_funcs[i].correct_status)) {
-                       printf("(%d) incorrect status %s should be %s (i=%d with_file=%d open_func=0x%x)\n", 
-                              __LINE__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
+                       printf("(%s) incorrect status %s should be %s (i=%d with_file=%d open_func=0x%x)\n", 
+                              __location__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
                               i, (int)open_funcs[i].with_file, (int)open_funcs[i].open_func);
-                       ret = False;
+                       ret = false;
                }
-               if (NT_STATUS_IS_OK(status) || open_funcs[i].with_file) {
-                       cli_close(cli->tree, io.t2open.out.fnum);
-                       cli_unlink(cli->tree, fname);
+               if (NT_STATUS_IS_OK(status)) {
+                       smbcli_close(cli->tree, io.t2open.out.file.fnum);
                }
        }
 
+       smbcli_unlink(cli->tree, fname1);
+       smbcli_unlink(cli->tree, fname2);
+
        /* check the basic return fields */
-       fnum = create_complex_file(cli, mem_ctx, fname);
-       cli_close(cli->tree, fnum);
        io.t2open.in.open_func = OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       io.t2open.in.write_time = 0;
+       io.t2open.in.fname = fname;
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.t2open.out.fnum;
+       fnum = io.t2open.out.file.fnum;
 
        CHECK_ALL_INFO(io.t2open.out.size, size);
+#if 0
+       /* windows appears to leak uninitialised memory here */
        CHECK_VAL(io.t2open.out.write_time, 0);
-       CHECK_ALL_INFO(io.t2open.out.attrib, attrib);
+#endif
+       CHECK_ALL_INFO(io.t2open.out.attrib, attrib & ~FILE_ATTRIBUTE_NONINDEXED);
        CHECK_VAL(io.t2open.out.access, OPENX_MODE_DENY_NONE | OPENX_MODE_ACCESS_RDWR);
        CHECK_VAL(io.t2open.out.ftype, 0);
        CHECK_VAL(io.t2open.out.devstate, 0);
-       CHECK_VAL(io.t2open.out.action, OPENX_ACTION_EXISTED);
-       cli_close(cli->tree, fnum);
+       CHECK_VAL(io.t2open.out.action, OPENX_ACTION_CREATED);
+       smbcli_close(cli->tree, fnum);
+
+       status = torture_check_ea(cli, fname, ".CLASSINFO", "first value");
+       CHECK_STATUS(status, io.t2open.in.num_eas
+                    ? NT_STATUS_OK : NT_STATUS_EAS_NOT_SUPPORTED);
+       status = torture_check_ea(cli, fname, "EA TWO", "foo");
+       CHECK_STATUS(status, io.t2open.in.num_eas
+                    ? NT_STATUS_OK : NT_STATUS_EAS_NOT_SUPPORTED);
+       status = torture_check_ea(cli, fname, "X THIRD", "xy");
+       CHECK_STATUS(status, io.t2open.in.num_eas
+                    ? NT_STATUS_OK : NT_STATUS_EAS_NOT_SUPPORTED);
 
        /* now check the search attrib for hidden files - win2003 ignores this? */
        SET_ATTRIB(FILE_ATTRIBUTE_HIDDEN);
        CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN, attrib);
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       cli_close(cli->tree, io.t2open.out.fnum);
+       smbcli_close(cli->tree, io.t2open.out.file.fnum);
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       cli_close(cli->tree, io.t2open.out.fnum);
+       smbcli_close(cli->tree, io.t2open.out.file.fnum);
 
        SET_ATTRIB(FILE_ATTRIBUTE_NORMAL);
-       cli_unlink(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
 
        /* and check attrib on create */
        io.t2open.in.open_func = OPENX_OPEN_FUNC_FAIL | OPENX_OPEN_FUNC_CREATE;
        io.t2open.in.file_attrs = FILE_ATTRIBUTE_SYSTEM;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
 
        /* check timeout on create - win2003 ignores the timeout! */
        io.t2open.in.open_func = OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE;
        io.t2open.in.file_attrs = 0;
+       io.t2open.in.timeout = 20000;
        io.t2open.in.open_mode = OPENX_MODE_ACCESS_RDWR | OPENX_MODE_DENY_ALL;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_SHARING_VIOLATION);
 
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -572,35 +661,35 @@ done:
 /*
   test RAW_OPEN_NTCREATEX
 */
-static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        union smb_fileinfo finfo;
        const char *fname = BASEDIR "\\torture_ntcreatex.txt";
        const char *dname = BASEDIR "\\torture_ntcreatex.dir";
        NTSTATUS status;
-       int fnum;
-       BOOL ret = True;
+       int fnum = -1;
+       bool ret = true;
        int i;
        struct {
                uint32_t open_disp;
-               BOOL with_file;
+               bool with_file;
                NTSTATUS correct_status;
        } open_funcs[] = {
-               { NTCREATEX_DISP_SUPERSEDE,     True,  NT_STATUS_OK },
-               { NTCREATEX_DISP_SUPERSEDE,     False, NT_STATUS_OK },
-               { NTCREATEX_DISP_OPEN,          True,  NT_STATUS_OK },
-               { NTCREATEX_DISP_OPEN,          False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { NTCREATEX_DISP_CREATE,        True,  NT_STATUS_OBJECT_NAME_COLLISION },
-               { NTCREATEX_DISP_CREATE,        False, NT_STATUS_OK },
-               { NTCREATEX_DISP_OPEN_IF,       True,  NT_STATUS_OK },
-               { NTCREATEX_DISP_OPEN_IF,       False, NT_STATUS_OK },
-               { NTCREATEX_DISP_OVERWRITE,     True,  NT_STATUS_OK },
-               { NTCREATEX_DISP_OVERWRITE,     False, NT_STATUS_OBJECT_NAME_NOT_FOUND },
-               { NTCREATEX_DISP_OVERWRITE_IF,  True,  NT_STATUS_OK },
-               { NTCREATEX_DISP_OVERWRITE_IF,  False, NT_STATUS_OK },
-               { 6,                            True,  NT_STATUS_INVALID_PARAMETER },
-               { 6,                            False, NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_SUPERSEDE,     true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_SUPERSEDE,     false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN,          true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN,          false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_CREATE,        true,  NT_STATUS_OBJECT_NAME_COLLISION },
+               { NTCREATEX_DISP_CREATE,        false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_OVERWRITE_IF,  true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE_IF,  false, NT_STATUS_OK },
+               { 6,                            true,  NT_STATUS_INVALID_PARAMETER },
+               { 6,                            false, NT_STATUS_INVALID_PARAMETER },
        };
 
        printf("Checking RAW_OPEN_NTCREATEX\n");
@@ -609,7 +698,180 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
        io.ntcreatex.in.root_fid = 0;
-       io.ntcreatex.in.access_mask = GENERIC_RIGHTS_FILE_ALL_ACCESS;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.alloc_size = 1024*1024;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname;
+
+       /* test the open disposition */
+       for (i=0; i<ARRAY_SIZE(open_funcs); i++) {
+               if (open_funcs[i].with_file) {
+                       fnum = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR|O_TRUNC, DENY_NONE);
+                       if (fnum == -1) {
+                               d_printf("Failed to create file %s - %s\n", fname, smbcli_errstr(cli->tree));
+                               ret = false;
+                               goto done;
+                       }
+                       smbcli_close(cli->tree, fnum);
+               }
+               io.ntcreatex.in.open_disposition = open_funcs[i].open_disp;
+               status = smb_raw_open(cli->tree, tctx, &io);
+               if (!NT_STATUS_EQUAL(status, open_funcs[i].correct_status)) {
+                       printf("(%s) incorrect status %s should be %s (i=%d with_file=%d open_disp=%d)\n", 
+                              __location__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
+                              i, (int)open_funcs[i].with_file, (int)open_funcs[i].open_disp);
+                       ret = false;
+               }
+               if (NT_STATUS_IS_OK(status) || open_funcs[i].with_file) {
+                       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+                       smbcli_unlink(cli->tree, fname);
+               }
+       }
+
+       /* basic field testing */
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.file.fnum;
+
+       CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
+       CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_CREATED);
+       CHECK_NTTIME(io.ntcreatex.out.create_time, create_time);
+       CHECK_NTTIME(io.ntcreatex.out.access_time, access_time);
+       CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
+       CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
+       CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+       CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
+       CHECK_ALL_INFO(io.ntcreatex.out.size, size);
+       CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
+       CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
+
+       /* check fields when the file already existed */
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+       fnum = create_complex_file(cli, tctx, fname);
+       if (fnum == -1) {
+               ret = false;
+               goto done;
+       }
+       smbcli_close(cli->tree, fnum);
+
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.file.fnum;
+
+       CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
+       CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_EXISTED);
+       CHECK_NTTIME(io.ntcreatex.out.create_time, create_time);
+       CHECK_NTTIME(io.ntcreatex.out.access_time, access_time);
+       CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
+       CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
+       CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+       CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
+       CHECK_ALL_INFO(io.ntcreatex.out.size, size);
+       CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
+       CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+
+       /* create a directory */
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.fname = dname;
+       fname = dname;
+
+       smbcli_rmdir(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
+
+       io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.file.fnum;
+
+       CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
+       CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_CREATED);
+       CHECK_NTTIME(io.ntcreatex.out.create_time, create_time);
+       CHECK_NTTIME(io.ntcreatex.out.access_time, access_time);
+       CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
+       CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
+       CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+       CHECK_VAL(io.ntcreatex.out.attrib & ~FILE_ATTRIBUTE_NONINDEXED, 
+                 FILE_ATTRIBUTE_DIRECTORY);
+       CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
+       CHECK_ALL_INFO(io.ntcreatex.out.size, size);
+       CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
+       CHECK_VAL(io.ntcreatex.out.is_directory, 1);
+       CHECK_VAL(io.ntcreatex.out.size, 0);
+       CHECK_VAL(io.ntcreatex.out.alloc_size, 0);
+       CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
+       smbcli_unlink(cli->tree, fname);
+       
+
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+       return ret;
+}
+
+
+/*
+  test RAW_OPEN_NTTRANS_CREATE
+*/
+static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context *tctx)
+{
+       union smb_open io;
+       union smb_fileinfo finfo;
+       const char *fname = BASEDIR "\\torture_ntcreatex.txt";
+       const char *dname = BASEDIR "\\torture_ntcreatex.dir";
+       NTSTATUS status;
+       int fnum = -1;
+       bool ret = true;
+       int i;
+       struct {
+               uint32_t open_disp;
+               bool with_file;
+               NTSTATUS correct_status;
+       } open_funcs[] = {
+               { NTCREATEX_DISP_SUPERSEDE,     true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_SUPERSEDE,     false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN,          true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN,          false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_CREATE,        true,  NT_STATUS_OBJECT_NAME_COLLISION },
+               { NTCREATEX_DISP_CREATE,        false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       false, NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     false, NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_OVERWRITE_IF,  true,  NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE_IF,  false, NT_STATUS_OK },
+               { 6,                            true,  NT_STATUS_INVALID_PARAMETER },
+               { 6,                            false, NT_STATUS_INVALID_PARAMETER },
+       };
+
+       printf("Checking RAW_OPEN_NTTRANS_CREATE\n");
+
+       /* reasonable default parameters */
+       io.generic.level = RAW_OPEN_NTTRANS_CREATE;
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
        io.ntcreatex.in.alloc_size = 1024*1024;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
        io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
@@ -618,38 +880,40 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
        io.ntcreatex.in.fname = fname;
+       io.ntcreatex.in.sec_desc = NULL;
+       io.ntcreatex.in.ea_list = NULL;
 
        /* test the open disposition */
        for (i=0; i<ARRAY_SIZE(open_funcs); i++) {
                if (open_funcs[i].with_file) {
-                       fnum = cli_open(cli->tree, fname, O_CREAT|O_RDWR|O_TRUNC, DENY_NONE);
+                       fnum = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR|O_TRUNC, DENY_NONE);
                        if (fnum == -1) {
-                               d_printf("Failed to create file %s - %s\n", fname, cli_errstr(cli->tree));
-                               ret = False;
+                               d_printf("Failed to create file %s - %s\n", fname, smbcli_errstr(cli->tree));
+                               ret = false;
                                goto done;
                        }
-                       cli_close(cli->tree, fnum);
+                       smbcli_close(cli->tree, fnum);
                }
                io.ntcreatex.in.open_disposition = open_funcs[i].open_disp;
-               status = smb_raw_open(cli->tree, mem_ctx, &io);
+               status = smb_raw_open(cli->tree, tctx, &io);
                if (!NT_STATUS_EQUAL(status, open_funcs[i].correct_status)) {
-                       printf("(%d) incorrect status %s should be %s (i=%d with_file=%d open_disp=%d)\n", 
-                              __LINE__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
+                       printf("(%s) incorrect status %s should be %s (i=%d with_file=%d open_disp=%d)\n", 
+                              __location__, nt_errstr(status), nt_errstr(open_funcs[i].correct_status),
                               i, (int)open_funcs[i].with_file, (int)open_funcs[i].open_disp);
-                       ret = False;
+                       ret = false;
                }
                if (NT_STATUS_IS_OK(status) || open_funcs[i].with_file) {
-                       cli_close(cli->tree, io.ntcreatex.out.fnum);
-                       cli_unlink(cli->tree, fname);
+                       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+                       smbcli_unlink(cli->tree, fname);
                }
        }
 
        /* basic field testing */
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.ntcreatex.out.fnum;
+       fnum = io.ntcreatex.out.file.fnum;
 
        CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
        CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_CREATED);
@@ -664,19 +928,19 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
 
        /* check fields when the file already existed */
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
-       fnum = create_complex_file(cli, mem_ctx, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+       fnum = create_complex_file(cli, tctx, fname);
        if (fnum == -1) {
-               ret = False;
+               ret = false;
                goto done;
        }
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
 
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.ntcreatex.out.fnum;
+       fnum = io.ntcreatex.out.file.fnum;
 
        CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
        CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_EXISTED);
@@ -689,13 +953,58 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        CHECK_ALL_INFO(io.ntcreatex.out.size, size);
        CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
        CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+
+       /* check no-recall - don't pull a file from tape on a HSM */
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_NO_RECALL;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.file.fnum;
+
+       CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
+       CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_EXISTED);
+       CHECK_NTTIME(io.ntcreatex.out.create_time, create_time);
+       CHECK_NTTIME(io.ntcreatex.out.access_time, access_time);
+       CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
+       CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
+       CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+       CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
+       CHECK_ALL_INFO(io.ntcreatex.out.size, size);
+       CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
+       CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
+       smbcli_close(cli->tree, fnum);
+
+       /* Check some create options (these all should be ignored) */
+       for (i=0; i < 32; i++) {
+               uint32_t create_option = (1 << i) & NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+               if (create_option == 0) {
+                       continue;
+               }
+               io.ntcreatex.in.create_options = create_option;
+               status = smb_raw_open(cli->tree, tctx, &io);
+               CHECK_STATUS(status, NT_STATUS_OK);
+               fnum = io.ntcreatex.out.file.fnum;
+
+               CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
+               CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_EXISTED);
+               CHECK_NTTIME(io.ntcreatex.out.create_time, create_time);
+               CHECK_NTTIME(io.ntcreatex.out.access_time, access_time);
+               CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
+               CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
+               CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+               CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
+               CHECK_ALL_INFO(io.ntcreatex.out.size, size);
+               CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
+               CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
+               smbcli_close(cli->tree, fnum);
+       }
+
+       smbcli_unlink(cli->tree, fname);
 
 
        /* create a directory */
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
-       io.ntcreatex.in.access_mask = GENERIC_RIGHTS_FILE_ALL_ACCESS;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
        io.ntcreatex.in.alloc_size = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
        io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
@@ -704,16 +1013,16 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.ntcreatex.in.fname = dname;
        fname = dname;
 
-       cli_rmdir(cli->tree, fname);
-       cli_unlink(cli->tree, fname);
+       smbcli_rmdir(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
 
-       io.ntcreatex.in.access_mask = SEC_RIGHT_MAXIMUM_ALLOWED;
+       io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
        io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.ntcreatex.out.fnum;
+       fnum = io.ntcreatex.out.file.fnum;
 
        CHECK_VAL(io.ntcreatex.out.oplock_level, 0);
        CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_CREATED);
@@ -722,7 +1031,8 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        CHECK_NTTIME(io.ntcreatex.out.write_time, write_time);
        CHECK_NTTIME(io.ntcreatex.out.change_time, change_time);
        CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
-       CHECK_VAL(io.ntcreatex.out.attrib, FILE_ATTRIBUTE_DIRECTORY);
+       CHECK_VAL(io.ntcreatex.out.attrib & ~FILE_ATTRIBUTE_NONINDEXED, 
+                 FILE_ATTRIBUTE_DIRECTORY);
        CHECK_ALL_INFO(io.ntcreatex.out.alloc_size, alloc_size);
        CHECK_ALL_INFO(io.ntcreatex.out.size, size);
        CHECK_ALL_INFO(io.ntcreatex.out.is_directory, directory);
@@ -730,12 +1040,12 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        CHECK_VAL(io.ntcreatex.out.size, 0);
        CHECK_VAL(io.ntcreatex.out.alloc_size, 0);
        CHECK_VAL(io.ntcreatex.out.file_type, FILE_TYPE_DISK);
-       cli_unlink(cli->tree, fname);
+       smbcli_unlink(cli->tree, fname);
        
 
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -748,16 +1058,17 @@ done:
   open_disposition==NTCREATEX_DISP_OVERWRITE_IF. Windows 2003 allows the
   second open.
 */
-static BOOL test_ntcreatex_brlocked(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_ntcreatex_brlocked(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io, io1;
        union smb_lock io2;
        struct smb_lock_entry lock[1];
        const char *fname = BASEDIR "\\torture_ntcreatex.txt";
        NTSTATUS status;
-       BOOL ret = True;
+       bool ret = true;
+
+       printf("Testing ntcreatex with a byte range locked file\n");
 
-       /* reasonable default parameters */
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
        io.ntcreatex.in.root_fid = 0;
@@ -773,11 +1084,11 @@ static BOOL test_ntcreatex_brlocked(struct cli_state *cli, TALLOC_CTX *mem_ctx)
                NTCREATEX_SECURITY_ALL;
        io.ntcreatex.in.fname = fname;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        io2.lockx.level = RAW_LOCK_LOCKX;
-       io2.lockx.in.fnum = io.ntcreatex.out.fnum;
+       io2.lockx.in.file.fnum = io.ntcreatex.out.file.fnum;
        io2.lockx.in.mode = LOCKING_ANDX_LARGE_FILES;
        io2.lockx.in.timeout = 0;
        io2.lockx.in.ulock_cnt = 0;
@@ -804,26 +1115,26 @@ static BOOL test_ntcreatex_brlocked(struct cli_state *cli, TALLOC_CTX *mem_ctx)
                NTCREATEX_SECURITY_ALL;
        io1.ntcreatex.in.fname = fname;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io1);
+       status = smb_raw_open(cli->tree, tctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
 
  done:
-       cli_close(cli->tree, io.ntcreatex.out.fnum);
-       cli_close(cli->tree, io1.ntcreatex.out.fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+       smbcli_close(cli->tree, io1.ntcreatex.out.file.fnum);
+       smbcli_unlink(cli->tree, fname);
        return ret;
 }
 
 /*
   test RAW_OPEN_MKNEW
 */
-static BOOL test_mknew(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_mknew(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_mknew.txt";
        NTSTATUS status;
-       int fnum;
-       BOOL ret = True;
+       int fnum = -1;
+       bool ret = true;
        time_t basetime = (time(NULL) + 3600*24*3) & ~1;
        union smb_fileinfo finfo;
 
@@ -833,36 +1144,37 @@ static BOOL test_mknew(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.mknew.in.attrib = 0;
        io.mknew.in.write_time = 0;
        io.mknew.in.fname = fname;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.mknew.out.fnum;
+       fnum = io.mknew.out.file.fnum;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
 
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* make sure write_time works */
        io.mknew.in.write_time = basetime;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.mknew.out.fnum;
+       fnum = io.mknew.out.file.fnum;
        CHECK_TIME(basetime, write_time);
 
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* make sure file_attrs works */
        io.mknew.in.attrib = FILE_ATTRIBUTE_HIDDEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.mknew.out.fnum;
-       CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_ARCHIVE, attrib);
+       fnum = io.mknew.out.file.fnum;
+       CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_ARCHIVE, 
+                      attrib & ~FILE_ATTRIBUTE_NONINDEXED);
        
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -871,13 +1183,13 @@ done:
 /*
   test RAW_OPEN_CREATE
 */
-static BOOL test_create(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_create(struct smbcli_state *cli, struct torture_context *tctx)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_create.txt";
        NTSTATUS status;
-       int fnum;
-       BOOL ret = True;
+       int fnum = -1;
+       bool ret = true;
        time_t basetime = (time(NULL) + 3600*24*3) & ~1;
        union smb_fileinfo finfo;
 
@@ -887,37 +1199,38 @@ static BOOL test_create(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.create.in.attrib = 0;
        io.create.in.write_time = 0;
        io.create.in.fname = fname;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.create.out.fnum;
+       fnum = io.create.out.file.fnum;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
 
-       cli_close(cli->tree, io.create.out.fnum);
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, io.create.out.file.fnum);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* make sure write_time works */
        io.create.in.write_time = basetime;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.create.out.fnum;
+       fnum = io.create.out.file.fnum;
        CHECK_TIME(basetime, write_time);
 
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        /* make sure file_attrs works */
        io.create.in.attrib = FILE_ATTRIBUTE_HIDDEN;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.create.out.fnum;
-       CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_ARCHIVE, attrib);
+       fnum = io.create.out.file.fnum;
+       CHECK_ALL_INFO(FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_ARCHIVE, 
+                      attrib & ~FILE_ATTRIBUTE_NONINDEXED);
        
 done:
-       cli_close(cli->tree, fnum);
-       cli_unlink(cli->tree, fname);
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
 
        return ret;
 }
@@ -926,12 +1239,12 @@ done:
 /*
   test RAW_OPEN_CTEMP
 */
-static BOOL test_ctemp(struct cli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_ctemp(struct smbcli_state *cli, TALLOC_CTX *tctx)
 {
        union smb_open io;
        NTSTATUS status;
-       int fnum;
-       BOOL ret = True;
+       int fnum = -1;
+       bool ret = true;
        time_t basetime = (time(NULL) + 3600*24*3) & ~1;
        union smb_fileinfo finfo;
        const char *name, *fname = NULL;
@@ -942,90 +1255,277 @@ static BOOL test_ctemp(struct cli_state *cli, TALLOC_CTX *mem_ctx)
        io.ctemp.in.attrib = FILE_ATTRIBUTE_HIDDEN;
        io.ctemp.in.write_time = basetime;
        io.ctemp.in.directory = BASEDIR;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum = io.ctemp.out.fnum;
+       fnum = io.ctemp.out.file.fnum;
 
        name = io.ctemp.out.name;
 
        finfo.generic.level = RAW_FILEINFO_NAME_INFO;
-       finfo.generic.in.fnum = fnum;
-       status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo);
+       finfo.generic.in.file.fnum = fnum;
+       status = smb_raw_fileinfo(cli->tree, tctx, &finfo);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        fname = finfo.name_info.out.fname.s;
        d_printf("ctemp name=%s  real name=%s\n", name, fname);
 
-       CHECK_TIME(basetime, write_time);
-
 done:
-       cli_close(cli->tree, fnum);
+       smbcli_close(cli->tree, fnum);
        if (fname) {
-               cli_unlink(cli->tree, fname);
+               smbcli_unlink(cli->tree, fname);
        }
 
        return ret;
 }
 
-/* basic testing of all RAW_OPEN_* calls 
+
+/*
+  test chained RAW_OPEN_OPENX_READX
 */
-BOOL torture_raw_open(int dummy)
+static bool test_chained(struct smbcli_state *cli, TALLOC_CTX *tctx)
 {
-       struct cli_state *cli;
-       BOOL ret = True;
-       TALLOC_CTX *mem_ctx;
+       union smb_open io;
+       const char *fname = BASEDIR "\\torture_chained.txt";
+       NTSTATUS status;
+       int fnum = -1;
+       bool ret = true;
+       const char *buf = "test";
+       char buf2[4];
+
+       printf("Checking RAW_OPEN_OPENX chained with READX\n");
+       smbcli_unlink(cli->tree, fname);
+
+       fnum = create_complex_file(cli, tctx, fname);
+
+       smbcli_write(cli->tree, fnum, 0, buf, 0, sizeof(buf));
+
+       smbcli_close(cli->tree, fnum);  
+
+       io.openxreadx.level = RAW_OPEN_OPENX_READX;
+       io.openxreadx.in.fname = fname;
+       io.openxreadx.in.flags = OPENX_FLAGS_ADDITIONAL_INFO;
+       io.openxreadx.in.open_mode = OPENX_MODE_ACCESS_RDWR;
+       io.openxreadx.in.open_func = OPENX_OPEN_FUNC_OPEN;
+       io.openxreadx.in.search_attrs = 0;
+       io.openxreadx.in.file_attrs = 0;
+       io.openxreadx.in.write_time = 0;
+       io.openxreadx.in.size = 1024*1024;
+       io.openxreadx.in.timeout = 0;
+       
+       io.openxreadx.in.offset = 0;
+       io.openxreadx.in.mincnt = sizeof(buf);
+       io.openxreadx.in.maxcnt = sizeof(buf);
+       io.openxreadx.in.remaining = 0;
+       io.openxreadx.out.data = (uint8_t *)buf2;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.openxreadx.out.file.fnum;
 
-       if (!torture_open_connection(&cli)) {
-               return False;
+       if (memcmp(buf, buf2, sizeof(buf)) != 0) {
+               d_printf("wrong data in reply buffer\n");
+               ret = false;
        }
 
-       mem_ctx = talloc_init("torture_raw_open");
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+       return ret;
+}
 
-       if (cli_deltree(cli->tree, BASEDIR) == -1) {
-               printf("Failed to clean " BASEDIR "\n");
-               return False;
-       }
-       if (NT_STATUS_IS_ERR(cli_mkdir(cli->tree, BASEDIR))) {
-               printf("Failed to create " BASEDIR " - %s\n", cli_errstr(cli->tree));
-               return False;
-       }
+/*
+  test RAW_OPEN_OPENX without a leading slash on the path.
+  NetApp filers are known to fail on this.
+  
+*/
+static bool test_no_leading_slash(struct smbcli_state *cli, TALLOC_CTX *tctx)
+{
+       union smb_open io;
+       const char *fname = BASEDIR "\\torture_no_leading_slash.txt";
+       NTSTATUS status;
+       int fnum = -1;
+       bool ret = true;
+       const char *buf = "test";
+
+       printf("Checking RAW_OPEN_OPENX without leading slash on path\n");
+       smbcli_unlink(cli->tree, fname);
 
-       if (!test_ntcreatex_brlocked(cli, mem_ctx)) {
-               return False;
+        /* Create the file */
+       fnum = create_complex_file(cli, tctx, fname);
+       smbcli_write(cli->tree, fnum, 0, buf, 0, sizeof(buf));
+       smbcli_close(cli->tree, fnum);  
+
+        /* Prepare to open the file using path without leading slash */
+       io.openx.level = RAW_OPEN_OPENX;
+       io.openx.in.fname = fname + 1;
+       io.openx.in.flags = OPENX_FLAGS_ADDITIONAL_INFO;
+       io.openx.in.open_mode = OPENX_MODE_ACCESS_RDWR;
+       io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN;
+       io.openx.in.search_attrs = 0;
+       io.openx.in.file_attrs = 0;
+       io.openx.in.write_time = 0;
+       io.openx.in.size = 1024*1024;
+       io.openx.in.timeout = 0;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.openx.out.file.fnum;
+
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+       return ret;
+}
+
+/* A little torture test to expose a race condition in Samba 3.0.20 ... :-) */
+
+static bool test_raw_open_multi(struct torture_context *tctx)
+{
+       struct smbcli_state *cli;
+       TALLOC_CTX *mem_ctx = talloc_init("torture_test_oplock_multi");
+       const char *fname = "\\test_oplock.dat";
+       NTSTATUS status;
+       bool ret = true;
+       union smb_open io;
+       struct smbcli_state **clients;
+       struct smbcli_request **requests;
+       union smb_open *ios;
+       const char *host = torture_setting_string(tctx, "host", NULL);
+       const char *share = torture_setting_string(tctx, "share", NULL);
+       int i, num_files = 3;
+       int num_ok = 0;
+       int num_collision = 0;
+       
+       clients = talloc_array(mem_ctx, struct smbcli_state *, num_files);
+       requests = talloc_array(mem_ctx, struct smbcli_request *, num_files);
+       ios = talloc_array(mem_ctx, union smb_open, num_files);
+       if ((tctx->ev == NULL) || (clients == NULL) || (requests == NULL) ||
+           (ios == NULL)) {
+               DEBUG(0, ("talloc failed\n"));
+               return false;
        }
 
-       if (!test_open(cli, mem_ctx)) {
-               ret = False;
+       if (!torture_open_connection_share(mem_ctx, &cli, tctx, host, share, tctx->ev)) {
+               return false;
        }
 
-       if (!test_openx(cli, mem_ctx)) {
-               ret = False;
+       cli->tree->session->transport->options.request_timeout = 60;
+
+       for (i=0; i<num_files; i++) {
+               if (!torture_open_connection_share(mem_ctx, &(clients[i]),
+                                                  tctx, host, share, tctx->ev)) {
+                       DEBUG(0, ("Could not open %d'th connection\n", i));
+                       return false;
+               }
+               clients[i]->tree->session->transport->options.request_timeout = 60;
        }
 
-       if (!test_ntcreatex(cli, mem_ctx)) {
-               ret = False;
+       /* cleanup */
+       smbcli_unlink(cli->tree, fname);
+
+       /*
+         base ntcreatex parms
+       */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ|
+               NTCREATEX_SHARE_ACCESS_WRITE|
+               NTCREATEX_SHARE_ACCESS_DELETE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname;
+       io.ntcreatex.in.flags = 0;
+
+       for (i=0; i<num_files; i++) {
+               ios[i] = io;
+               requests[i] = smb_raw_open_send(clients[i]->tree, &ios[i]);
+               if (requests[i] == NULL) {
+                       DEBUG(0, ("could not send %d'th request\n", i));
+                       return false;
+               }
        }
 
-       if (!test_t2open(cli, mem_ctx)) {
-               ret = False;
+       DEBUG(10, ("waiting for replies\n"));
+       while (1) {
+               bool unreplied = false;
+               for (i=0; i<num_files; i++) {
+                       if (requests[i] == NULL) {
+                               continue;
+                       }
+                       if (requests[i]->state < SMBCLI_REQUEST_DONE) {
+                               unreplied = true;
+                               break;
+                       }
+                       status = smb_raw_open_recv(requests[i], mem_ctx,
+                                                  &ios[i]);
+
+                       DEBUG(0, ("File %d returned status %s\n", i,
+                                 nt_errstr(status)));
+
+                       if (NT_STATUS_IS_OK(status)) {
+                               num_ok += 1;
+                       } 
+
+                       if (NT_STATUS_EQUAL(status,
+                                           NT_STATUS_OBJECT_NAME_COLLISION)) {
+                               num_collision += 1;
+                       }
+
+                       requests[i] = NULL;
+               }
+               if (!unreplied) {
+                       break;
+               }
+
+               if (event_loop_once(tctx->ev) != 0) {
+                       DEBUG(0, ("event_loop_once failed\n"));
+                       return false;
+               }
        }
 
-       if (!test_mknew(cli, mem_ctx)) {
-               ret = False;
+       if ((num_ok != 1) || (num_ok + num_collision != num_files)) {
+               ret = false;
        }
 
-       if (!test_create(cli, mem_ctx)) {
-               ret = False;
+       for (i=0; i<num_files; i++) {
+               torture_close_connection(clients[i]);
        }
+       talloc_free(mem_ctx);
+       return ret;
+}
+
+/* basic testing of all RAW_OPEN_* calls 
+*/
+bool torture_raw_open(struct torture_context *torture, struct smbcli_state *cli)
+{
+       bool ret = true;
 
-       if (!test_ctemp(cli, mem_ctx)) {
-               ret = False;
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
        }
 
+       ret &= test_ntcreatex_brlocked(cli, torture);
+       ret &= test_open(cli, torture);
+       ret &= test_raw_open_multi(torture);
+       ret &= test_openx(cli, torture);
+       ret &= test_ntcreatex(cli, torture);
+       ret &= test_nttrans_create(cli, torture);
+       ret &= test_t2open(cli, torture);
+       ret &= test_mknew(cli, torture);
+       ret &= test_create(cli, torture);
+       ret &= test_ctemp(cli, torture);
+       ret &= test_chained(cli, torture);
+       ret &= test_no_leading_slash(cli, torture);
+
        smb_raw_exit(cli->session);
-       cli_deltree(cli->tree, BASEDIR);
+       smbcli_deltree(cli->tree, BASEDIR);
 
-       torture_close_connection(cli);
-       talloc_destroy(mem_ctx);
        return ret;
 }