Clean up some const and other compiler warnings.
[sharpe/samba-autobuild/.git] / source4 / torture / raw / open.c
index 39ff443ccdd93217ed36559409fac26633988104..beb629069f67e2ed6f4e71e0d0dcb04a45d7b0fb 100644 (file)
 */
 
 #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"
+#include "torture/raw/proto.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
@@ -66,7 +61,8 @@ static const char *rdwr_string(enum rdwr_mode m)
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \
-               printf("(%s) Incorrect status %s - should be %s\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                       "(%s) Incorrect status %s - should be %s\n", \
                       __location__, nt_errstr(status), nt_errstr(correct)); \
                ret = false; \
                goto done; \
@@ -75,7 +71,9 @@ static const char *rdwr_string(enum rdwr_mode m)
 #define CREATE_FILE do { \
        fnum = create_complex_file(cli, tctx, fname); \
        if (fnum == -1) { \
-               printf("(%s) Failed to create %s - %s\n", __location__, fname, smbcli_errstr(cli->tree)); \
+               torture_result(tctx, TORTURE_FAIL, \
+                       "(%s) Failed to create %s - %s\n", \
+                        __location__, fname, smbcli_errstr(cli->tree)); \
                ret = false; \
                goto done; \
        }} while (0)
@@ -83,7 +81,8 @@ static const char *rdwr_string(enum rdwr_mode m)
 #define CHECK_RDWR(fnum, correct) do { \
        enum rdwr_mode m = check_rdwr(cli->tree, fnum); \
        if (m != correct) { \
-               printf("(%s) Incorrect readwrite mode %s - expected %s\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                      "(%s) Incorrect readwrite mode %s - expected %s\n", \
                       __location__, rdwr_string(m), rdwr_string(correct)); \
                ret = false; \
        }} while (0)
@@ -97,7 +96,8 @@ static const char *rdwr_string(enum rdwr_mode m)
        t1 = t & ~1; \
        t2 = nt_time_to_unix(finfo.all_info.out.field) & ~1; \
        if (abs(t1-t2) > 2) { \
-               printf("(%s) wrong time for field %s  %s - %s\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                      "(%s) wrong time for field %s  %s - %s\n", \
                       __location__, #field, \
                       timestring(tctx, t1), \
                       timestring(tctx, t2)); \
@@ -113,7 +113,8 @@ static const char *rdwr_string(enum rdwr_mode m)
        CHECK_STATUS(status, NT_STATUS_OK); \
        t2 = finfo.all_info.out.field; \
        if (t != t2) { \
-               printf("(%s) wrong time for field %s  %s - %s\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                      "(%s) wrong time for field %s  %s - %s\n", \
                       __location__, #field, \
                       nt_time_string(tctx, t), \
                       nt_time_string(tctx, t2)); \
@@ -127,7 +128,8 @@ static const char *rdwr_string(enum rdwr_mode m)
        status = smb_raw_pathinfo(cli->tree, tctx, &finfo); \
        CHECK_STATUS(status, NT_STATUS_OK); \
        if ((v) != (finfo.all_info.out.field)) { \
-               printf("(%s) wrong value for field %s  0x%x - 0x%x\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                      "(%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; \
@@ -135,7 +137,8 @@ static const char *rdwr_string(enum rdwr_mode m)
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \
-               printf("(%s) wrong value for %s  0x%x - should be 0x%x\n", \
+               torture_result(tctx, TORTURE_FAIL, \
+                      "(%s) wrong value for %s  0x%x - should be 0x%x\n", \
                       __location__, #v, (int)(v), (int)correct); \
                ret = false; \
        }} while (0)
@@ -148,14 +151,14 @@ static const char *rdwr_string(enum rdwr_mode m)
        sfinfo.basic_info.in.attrib = sattrib; \
        status = smb_raw_setpathinfo(cli->tree, &sfinfo); \
        if (!NT_STATUS_IS_OK(status)) { \
-               printf("(%s) Failed to set attrib 0x%x on %s\n", \
-                      __location__, sattrib, fname); \
+               torture_warning(tctx, "(%s) Failed to set attrib 0x%x on %s\n", \
+                      __location__, (int)sattrib, fname); \
        }} while (0)
 
 /*
   test RAW_OPEN_OPEN
 */
-static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_open(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
@@ -164,7 +167,9 @@ static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
        int fnum = -1, fnum2;
        bool ret = true;
 
-       printf("Checking RAW_OPEN_OPEN\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        io.openold.level = RAW_OPEN_OPEN;
        io.openold.in.fname = fname;
@@ -224,7 +229,7 @@ static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
        CHECK_RDWR(fnum, RDWR_RDWR);
        
        if (io.openold.in.open_mode != io.openold.out.rmode) {
-               printf("(%s) rmode should equal open_mode - 0x%x 0x%x\n",
+               torture_warning(tctx, "(%s) rmode should equal open_mode - 0x%x 0x%x\n",
                       __location__, io.openold.out.rmode, io.openold.in.open_mode);
        }
 
@@ -257,7 +262,7 @@ static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -266,7 +271,7 @@ done:
 /*
   test RAW_OPEN_OPENX
 */
-static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_openx(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
@@ -296,8 +301,9 @@ static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
                { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
        };
 
-       printf("Checking RAW_OPEN_OPENX\n");
-       smbcli_unlink(cli->tree, fname);
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        io.openx.level = RAW_OPEN_OPENX;
        io.openx.in.fname = fname;
@@ -314,7 +320,9 @@ static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
                if (open_funcs[i].with_file) {
                        fnum = create_complex_file(cli, tctx, fname);
                        if (fnum == -1) {
-                               d_printf("Failed to create file %s - %s\n", fname, smbcli_errstr(cli->tree));
+                               torture_result(tctx, TORTURE_FAIL,
+                                       "Failed to create file %s - %s\n",
+                                       fname, smbcli_errstr(cli->tree));
                                ret = false;
                                goto done;
                        }
@@ -323,9 +331,13 @@ static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
                io.openx.in.open_func = open_funcs[i].open_func;
                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_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);
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%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;
                }
                if (NT_STATUS_IS_OK(status)) {
@@ -425,8 +437,10 @@ static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
        status = smb_raw_open(cli->tree, tctx, &io);
        CHECK_STATUS(status, NT_STATUS_SHARING_VIOLATION);
        if (timeval_elapsed(&tv) > 3.0) {
-               printf("(%s) Incorrect timing in openx with timeout - waited %.2f seconds\n",
-                      __location__, timeval_elapsed(&tv));
+               torture_result(tctx, TORTURE_FAIL,
+                       "(%s) Incorrect timing in openx with timeout "
+                       "- waited %.2f seconds\n",
+                       __location__, timeval_elapsed(&tv));
                ret = false;
        }
        smbcli_close(cli->tree, fnum);
@@ -484,8 +498,7 @@ static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname_exe);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -496,7 +509,7 @@ done:
 
   many thanks to kukks for a sniff showing how this works with os2->w2k
 */
-static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_t2open(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
@@ -526,16 +539,20 @@ static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
                { OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false, NT_STATUS_OK },
        };
 
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
        fnum = create_complex_file(cli, tctx, fname1);
        if (fnum == -1) {
-               d_printf("Failed to create file %s - %s\n", fname1, smbcli_errstr(cli->tree));
+               torture_result(tctx, TORTURE_FAIL,
+                       "(%s): Failed to create file %s - %s\n",
+                       __location__, 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.flags = OPENX_FLAGS_ADDITIONAL_INFO;
        io.t2open.in.open_mode = OPENX_MODE_DENY_NONE | OPENX_MODE_ACCESS_RDWR;
@@ -571,16 +588,21 @@ static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
                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__);
+                       torture_warning(tctx, "(%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("(%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);
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%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;
                }
                if (NT_STATUS_IS_OK(status)) {
@@ -652,7 +674,7 @@ static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -661,7 +683,7 @@ done:
 /*
   test RAW_OPEN_NTCREATEX
 */
-static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_ntcreatex(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
@@ -692,12 +714,14 @@ static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tct
                { 6,                            false, NT_STATUS_INVALID_PARAMETER },
        };
 
-       printf("Checking RAW_OPEN_NTCREATEX\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        /* reasonable default parameters */
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 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;
@@ -713,7 +737,9 @@ static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tct
                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));
+                               torture_result(tctx, TORTURE_FAIL,
+                                       "Failed to create file %s - %s\n",
+                                       fname, smbcli_errstr(cli->tree));
                                ret = false;
                                goto done;
                        }
@@ -722,9 +748,13 @@ static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tct
                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);
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%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) {
@@ -825,7 +855,7 @@ static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context *tct
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -834,7 +864,7 @@ done:
 /*
   test RAW_OPEN_NTTRANS_CREATE
 */
-static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_nttrans_create(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        union smb_fileinfo finfo;
@@ -845,6 +875,7 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
        bool ret = true;
        int i;
        uint32_t ok_mask, not_supported_mask, invalid_parameter_mask;
+       uint32_t not_a_directory_mask, unexpected_mask;
        struct {
                uint32_t open_disp;
                bool with_file;
@@ -866,12 +897,14 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                { 6,                            false, NT_STATUS_INVALID_PARAMETER },
        };
 
-       printf("Checking RAW_OPEN_NTTRANS_CREATE\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        /* 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.root_fid.fnum = 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;
@@ -889,7 +922,9 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                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));
+                               torture_result(tctx, TORTURE_FAIL,
+                                       "Failed to create file %s - %s\n",
+                                       fname, smbcli_errstr(cli->tree));
                                ret = false;
                                goto done;
                        }
@@ -898,9 +933,13 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                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);
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%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) {
@@ -984,8 +1023,9 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                io.ntcreatex.in.create_options = create_option;
                status = smb_raw_open(cli->tree, tctx, &io);
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("ntcreatex create option 0x%08x gave %s - should give NT_STATUS_OK\n",
-                              create_option, nt_errstr(status));
+                       torture_warning(tctx, "ntcreatex create option 0x%08x "
+                               "gave %s - should give NT_STATUS_OK\n",
+                               create_option, nt_errstr(status));
                }
                CHECK_STATUS(status, NT_STATUS_OK);
                fnum = io.ntcreatex.out.file.fnum;
@@ -1004,13 +1044,16 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                smbcli_close(cli->tree, fnum);
        }
 
-       ok_mask = not_supported_mask = invalid_parameter_mask = 0;
-
        io.ntcreatex.in.file_attr = 0;
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
        io.ntcreatex.in.access_mask     = SEC_FLAG_MAXIMUM_ALLOWED;
 
        /* Check for options that should return NOT_SUPPORTED, OK or INVALID_PARAMETER */
+       ok_mask = 0;
+       not_supported_mask = 0;
+       invalid_parameter_mask = 0;
+       not_a_directory_mask = 0;
+       unexpected_mask = 0;
        for (i=0; i < 32; i++) {
                uint32_t create_option = 1<<i;
                if (create_option & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) {
@@ -1025,14 +1068,20 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
                        smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
                } else if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
                        invalid_parameter_mask |= create_option;
+               } else if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_A_DIRECTORY)) {
+                       not_a_directory_mask |= 1<<i;
                } else {
-                       printf("create option 0x%08x returned %s\n", create_option, nt_errstr(status));
+                       unexpected_mask |= 1<<i;
+                       torture_comment(tctx, "create option 0x%08x returned %s\n",
+                                       create_option, nt_errstr(status));
                }
        }
 
        CHECK_VAL(ok_mask,                0x00efcfce);
+       CHECK_VAL(not_a_directory_mask,   0x00000001);
        CHECK_VAL(not_supported_mask,     0x00002000);
        CHECK_VAL(invalid_parameter_mask, 0xff100030);
+       CHECK_VAL(unexpected_mask,        0x00000000);
 
        smbcli_unlink(cli->tree, fname);
 
@@ -1080,7 +1129,7 @@ static bool test_nttrans_create(struct smbcli_state *cli, struct torture_context
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -1093,7 +1142,7 @@ done:
   open_disposition==NTCREATEX_DISP_OVERWRITE_IF. Windows 2003 allows the
   second open.
 */
-static bool test_ntcreatex_brlocked(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_ntcreatex_brlocked(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io, io1;
        union smb_lock io2;
@@ -1102,11 +1151,15 @@ static bool test_ntcreatex_brlocked(struct smbcli_state *cli, struct torture_con
        NTSTATUS status;
        bool ret = true;
 
-       printf("Testing ntcreatex with a byte range locked file\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
+       torture_comment(tctx, "Testing ntcreatex with a byte range locked file\n");
 
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.access_mask = 0x2019f;
        io.ntcreatex.in.alloc_size = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
@@ -1137,7 +1190,7 @@ static bool test_ntcreatex_brlocked(struct smbcli_state *cli, struct torture_con
 
        io1.generic.level = RAW_OPEN_NTCREATEX;
        io1.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
-       io1.ntcreatex.in.root_fid = 0;
+       io1.ntcreatex.in.root_fid.fnum = 0;
        io1.ntcreatex.in.access_mask = 0x20196;
        io1.ntcreatex.in.alloc_size = 0;
        io1.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
@@ -1156,14 +1209,14 @@ static bool test_ntcreatex_brlocked(struct smbcli_state *cli, struct torture_con
  done:
        smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
        smbcli_close(cli->tree, io1.ntcreatex.out.file.fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
        return ret;
 }
 
 /*
   test RAW_OPEN_MKNEW
 */
-static bool test_mknew(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_mknew(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_mknew.txt";
@@ -1173,7 +1226,9 @@ static bool test_mknew(struct smbcli_state *cli, struct torture_context *tctx)
        time_t basetime = (time(NULL) + 3600*24*3) & ~1;
        union smb_fileinfo finfo;
 
-       printf("Checking RAW_OPEN_MKNEW\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        io.mknew.level = RAW_OPEN_MKNEW;
        io.mknew.in.attrib = 0;
@@ -1209,7 +1264,7 @@ static bool test_mknew(struct smbcli_state *cli, struct torture_context *tctx)
        
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -1218,7 +1273,7 @@ done:
 /*
   test RAW_OPEN_CREATE
 */
-static bool test_create(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_create(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_create.txt";
@@ -1228,7 +1283,9 @@ static bool test_create(struct smbcli_state *cli, struct torture_context *tctx)
        time_t basetime = (time(NULL) + 3600*24*3) & ~1;
        union smb_fileinfo finfo;
 
-       printf("Checking RAW_OPEN_CREATE\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        io.create.level = RAW_OPEN_CREATE;
        io.create.in.attrib = 0;
@@ -1265,7 +1322,7 @@ static bool test_create(struct smbcli_state *cli, struct torture_context *tctx)
        
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -1274,7 +1331,7 @@ done:
 /*
   test RAW_OPEN_CTEMP
 */
-static bool test_ctemp(struct smbcli_state *cli, TALLOC_CTX *tctx)
+static bool test_ctemp(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        NTSTATUS status;
@@ -1284,7 +1341,9 @@ static bool test_ctemp(struct smbcli_state *cli, TALLOC_CTX *tctx)
        union smb_fileinfo finfo;
        const char *name, *fname = NULL;
 
-       printf("Checking RAW_OPEN_CTEMP\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        io.ctemp.level = RAW_OPEN_CTEMP;
        io.ctemp.in.attrib = FILE_ATTRIBUTE_HIDDEN;
@@ -1302,13 +1361,11 @@ static bool test_ctemp(struct smbcli_state *cli, TALLOC_CTX *tctx)
        CHECK_STATUS(status, NT_STATUS_OK);
 
        fname = finfo.name_info.out.fname.s;
-       d_printf("ctemp name=%s  real name=%s\n", name, fname);
+       torture_comment(tctx, "ctemp name=%s  real name=%s\n", name, fname);
 
 done:
        smbcli_close(cli->tree, fnum);
-       if (fname) {
-               smbcli_unlink(cli->tree, fname);
-       }
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -1317,7 +1374,7 @@ done:
 /*
   test chained RAW_OPEN_OPENX_READX
 */
-static bool test_chained(struct smbcli_state *cli, TALLOC_CTX *tctx)
+static bool test_chained(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_chained.txt";
@@ -1327,8 +1384,9 @@ static bool test_chained(struct smbcli_state *cli, TALLOC_CTX *tctx)
        const char *buf = "test";
        char buf2[4];
 
-       printf("Checking RAW_OPEN_OPENX chained with READX\n");
-       smbcli_unlink(cli->tree, fname);
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
 
        fnum = create_complex_file(cli, tctx, fname);
 
@@ -1358,13 +1416,14 @@ static bool test_chained(struct smbcli_state *cli, TALLOC_CTX *tctx)
        fnum = io.openxreadx.out.file.fnum;
 
        if (memcmp(buf, buf2, sizeof(buf)) != 0) {
-               d_printf("wrong data in reply buffer\n");
+               torture_result(tctx, TORTURE_FAIL,
+                       "wrong data in reply buffer\n");
                ret = false;
        }
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
@@ -1374,7 +1433,7 @@ done:
   NetApp filers are known to fail on this.
   
 */
-static bool test_no_leading_slash(struct smbcli_state *cli, TALLOC_CTX *tctx)
+static bool test_no_leading_slash(struct torture_context *tctx, struct smbcli_state *cli)
 {
        union smb_open io;
        const char *fname = BASEDIR "\\torture_no_leading_slash.txt";
@@ -1383,15 +1442,18 @@ static bool test_no_leading_slash(struct smbcli_state *cli, TALLOC_CTX *tctx)
        bool ret = true;
        const char *buf = "test";
 
-       printf("Checking RAW_OPEN_OPENX without leading slash on path\n");
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
        smbcli_unlink(cli->tree, fname);
 
-        /* Create the file */
+       /* 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 */
+       /* 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;
@@ -1409,14 +1471,61 @@ static bool test_no_leading_slash(struct smbcli_state *cli, TALLOC_CTX *tctx)
 
 done:
        smbcli_close(cli->tree, fnum);
-       smbcli_unlink(cli->tree, fname);
+       smbcli_deltree(cli->tree, BASEDIR);
+
+       return ret;
+}
+
+/*
+  test RAW_OPEN_OPENX against an existing directory to
+  ensure it returns NT_STATUS_FILE_IS_A_DIRECTORY.
+  Samba 3.2.0 - 3.2.6 are known to fail this.
+  
+*/
+static bool test_openx_over_dir(struct torture_context *tctx, struct smbcli_state *cli)
+{
+       union smb_open io;
+       const char *fname = BASEDIR "\\openx_over_dir";
+       NTSTATUS status;
+       int d_fnum = -1;
+       int fnum = -1;
+       bool ret = true;
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
+       /* Create the Directory */
+       status = create_directory_handle(cli->tree, fname, &d_fnum);
+       smbcli_close(cli->tree, d_fnum);        
+
+       /* Prepare to open the file over the directory. */
+       io.openx.level = RAW_OPEN_OPENX;
+       io.openx.in.fname = fname;
+       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_FILE_IS_A_DIRECTORY);
+       fnum = io.openx.out.file.fnum;
+
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_deltree(cli->tree, BASEDIR);
 
        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)
+static bool test_raw_open_multi(struct torture_context *tctx, struct smbcli_state *cli_ignored)
 {
        struct smbcli_state *cli;
        TALLOC_CTX *mem_ctx = talloc_init("torture_test_oplock_multi");
@@ -1438,7 +1547,8 @@ static bool test_raw_open_multi(struct torture_context *tctx)
        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"));
+               torture_result(tctx, TORTURE_FAIL, "(%s): talloc failed\n",
+                               __location__);
                return false;
        }
 
@@ -1451,7 +1561,9 @@ static bool test_raw_open_multi(struct torture_context *tctx)
        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));
+                       torture_result(tctx, TORTURE_FAIL,
+                                      "(%s): Could not open %d'th connection\n",
+                                      __location__, i);
                        return false;
                }
                clients[i]->tree->session->transport->options.request_timeout = 60;
@@ -1464,7 +1576,7 @@ static bool test_raw_open_multi(struct torture_context *tctx)
          base ntcreatex parms
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
        io.ntcreatex.in.alloc_size = 0;
        io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
@@ -1482,12 +1594,14 @@ static bool test_raw_open_multi(struct torture_context *tctx)
                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));
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%s): could not send %d'th request\n",
+                               __location__, i);
                        return false;
                }
        }
 
-       DEBUG(10, ("waiting for replies\n"));
+       torture_comment(tctx, "waiting for replies\n");
        while (1) {
                bool unreplied = false;
                for (i=0; i<num_files; i++) {
@@ -1501,8 +1615,8 @@ static bool test_raw_open_multi(struct torture_context *tctx)
                        status = smb_raw_open_recv(requests[i], mem_ctx,
                                                   &ios[i]);
 
-                       DEBUG(0, ("File %d returned status %s\n", i,
-                                 nt_errstr(status)));
+                       torture_comment(tctx, "File %d returned status %s\n", i,
+                                 nt_errstr(status));
 
                        if (NT_STATUS_IS_OK(status)) {
                                num_ok += 1;
@@ -1520,7 +1634,8 @@ static bool test_raw_open_multi(struct torture_context *tctx)
                }
 
                if (event_loop_once(tctx->ev) != 0) {
-                       DEBUG(0, ("event_loop_once failed\n"));
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%s): event_loop_once failed\n", __location__);
                        return false;
                }
        }
@@ -1536,31 +1651,444 @@ static bool test_raw_open_multi(struct torture_context *tctx)
        return ret;
 }
 
-/* basic testing of all RAW_OPEN_* calls 
+/*
+  test opening for delete on a read-only attribute file.
+*/
+static bool test_open_for_delete(struct torture_context *tctx, struct smbcli_state *cli)
+{
+       union smb_open io;
+       union smb_fileinfo finfo;
+       const char *fname = BASEDIR "\\torture_open_for_delete.txt";
+       NTSTATUS status;
+       int fnum = -1;
+       bool ret = true;
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
+       /* reasonable default parameters */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_READONLY;
+       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;
+
+       /* Create the readonly file. */
+
+       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);
+       io.ntcreatex.in.create_options = 0;
+       CHECK_VAL(io.ntcreatex.out.create_action, NTCREATEX_ACTION_CREATED);
+       CHECK_ALL_INFO(io.ntcreatex.out.attrib, attrib);
+       smbcli_close(cli->tree, fnum);
+
+       /* Now try and open for delete only - should succeed. */
+       io.ntcreatex.in.access_mask = SEC_STD_DELETE;
+       io.ntcreatex.in.file_attr = 0;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE | NTCREATEX_SHARE_ACCESS_DELETE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_unlink(cli->tree, fname);
+
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_deltree(cli->tree, BASEDIR);
+
+       return ret;
+}
+
+/*
+  test chained RAW_OPEN_NTCREATEX_READX
+  Send chained NTCREATEX_READX on a file that doesn't exist, then create
+  the file and try again.
 */
-bool torture_raw_open(struct torture_context *torture, struct smbcli_state *cli)
+static bool test_chained_ntcreatex_readx(struct torture_context *tctx, struct smbcli_state *cli)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       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];
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
+       torture_comment(tctx, "Checking RAW_NTCREATEX_READX chained on "
+                             "non-existant file \n");
+
+       /* ntcreatex parameters */
+       io.generic.level = RAW_OPEN_NTCREATEX_READX;
+       io.ntcreatexreadx.in.flags = 0;
+       io.ntcreatexreadx.in.root_fid.fnum = 0;
+       io.ntcreatexreadx.in.access_mask = SEC_FILE_READ_DATA;
+       io.ntcreatexreadx.in.alloc_size = 0;
+       io.ntcreatexreadx.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatexreadx.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+               NTCREATEX_SHARE_ACCESS_WRITE | NTCREATEX_SHARE_ACCESS_DELETE;
+       io.ntcreatexreadx.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatexreadx.in.create_options = 0;
+       io.ntcreatexreadx.in.impersonation = NTCREATEX_IMPERSONATION_IMPERSONATION;
+       io.ntcreatexreadx.in.security_flags = 0;
+       io.ntcreatexreadx.in.fname = fname;
+
+       /* readx parameters */
+       io.ntcreatexreadx.in.offset = 0;
+       io.ntcreatexreadx.in.mincnt = sizeof(buf);
+       io.ntcreatexreadx.in.maxcnt = sizeof(buf);
+       io.ntcreatexreadx.in.remaining = 0;
+       io.ntcreatexreadx.out.data = (uint8_t *)buf2;
+
+       /* try to open the non-existant file */
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       fnum = io.ntcreatexreadx.out.file.fnum;
+
+       smbcli_close(cli->tree, fnum);
+       smbcli_unlink(cli->tree, fname);
+
+       torture_comment(tctx, "Checking RAW_NTCREATEX_READX chained on "
+                             "existing file \n");
+
+       fnum = create_complex_file(cli, mem_ctx, fname);
+       smbcli_write(cli->tree, fnum, 0, buf, 0, sizeof(buf));
+       smbcli_close(cli->tree, fnum);
+
+       status = smb_raw_open(cli->tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       fnum = io.ntcreatexreadx.out.file.fnum;
+
+       if (memcmp(buf, buf2, sizeof(buf)) != 0) {
+               torture_result(tctx, TORTURE_FAIL,
+                       "(%s): wrong data in reply buffer\n", __location__);
+               ret = false;
+       }
+
+done:
+       smbcli_close(cli->tree, fnum);
+       smbcli_deltree(cli->tree, BASEDIR);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+static bool test_ntcreatex_opendisp_dir(struct torture_context *tctx,
+                                       struct smbcli_state *cli)
 {
+       const char *dname = BASEDIR "\\torture_ntcreatex_opendisp_dir";
+       NTSTATUS status;
        bool ret = true;
+       int i;
+       struct {
+               uint32_t open_disp;
+               bool dir_exists;
+               NTSTATUS correct_status;
+       } open_funcs_dir[] = {
+               { NTCREATEX_DISP_SUPERSEDE,     true,  NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_SUPERSEDE,     false, NT_STATUS_INVALID_PARAMETER },
+               { 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_INVALID_PARAMETER },
+               { NTCREATEX_DISP_OVERWRITE,     false, NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_OVERWRITE_IF,  true,  NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_OVERWRITE_IF,  false, NT_STATUS_INVALID_PARAMETER },
+               { 6,                            true,  NT_STATUS_INVALID_PARAMETER },
+               { 6,                            false, NT_STATUS_INVALID_PARAMETER },
+       };
+       union smb_open io;
+
+       ZERO_STRUCT(io);
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
+       io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.fname = dname;
 
        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);
+       smbcli_rmdir(cli->tree, dname);
+       smbcli_unlink(cli->tree, dname);
+
+       /* test the open disposition for directories */
+       torture_comment(tctx, "Testing open dispositions for directories...\n");
+
+       for (i=0; i<ARRAY_SIZE(open_funcs_dir); i++) {
+               if (open_funcs_dir[i].dir_exists) {
+                       status = smbcli_mkdir(cli->tree, dname);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               torture_result(tctx, TORTURE_FAIL,
+                                       "(%s): Failed to make directory "
+                                       "%s - %s\n", __location__, dname,
+                                       smbcli_errstr(cli->tree));
+                               ret = false;
+                               goto done;
+                       }
+               }
+
+               io.ntcreatex.in.open_disposition = open_funcs_dir[i].open_disp;
+               status = smb_raw_open(cli->tree, tctx, &io);
+               if (!NT_STATUS_EQUAL(status, open_funcs_dir[i].correct_status)) {
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%s) incorrect status %s should be %s "
+                               "(i=%d dir_exists=%d open_disp=%d)\n",
+                               __location__, nt_errstr(status),
+                               nt_errstr(open_funcs_dir[i].correct_status),
+                               i, (int)open_funcs_dir[i].dir_exists,
+                               (int)open_funcs_dir[i].open_disp);
+                       ret = false;
+               }
+               if (NT_STATUS_IS_OK(status) || open_funcs_dir[i].dir_exists) {
+                       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+                       smbcli_rmdir(cli->tree, dname);
+               }
+       }
+
+done:
        smbcli_deltree(cli->tree, BASEDIR);
 
        return ret;
 }
+
+/**
+ * Test what happens when trying to open a file with directory parameters and
+ * vice-versa.  Also test that NTCREATEX_OPTIONS_DIRECTORY is treated as
+ * mandatory and FILE_ATTRIBUTE_DIRECTORY is advisory for directory
+ * creation/opening.
+ */
+static bool test_ntcreatexdir(struct torture_context *tctx,
+    struct smbcli_state *cli)
+{
+       union smb_open io;
+       const char *fname = BASEDIR "\\torture_ntcreatex.txt";
+       const char *dname = BASEDIR "\\torture_ntcreatex_dir";
+       NTSTATUS status;
+       int i;
+
+       struct {
+               uint32_t open_disp;
+               uint32_t file_attr;
+               uint32_t create_options;
+               NTSTATUS correct_status;
+       } open_funcs[] = {
+               { NTCREATEX_DISP_SUPERSEDE,     0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_OPEN,          0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_CREATE,        0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_OVERWRITE_IF,  0, NTCREATEX_OPTIONS_DIRECTORY,
+                 NT_STATUS_INVALID_PARAMETER },
+               { NTCREATEX_DISP_SUPERSEDE,     FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN,          FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_CREATE,        FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OK },
+               { NTCREATEX_DISP_OPEN_IF,       FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OK },
+               { NTCREATEX_DISP_OVERWRITE,     FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OBJECT_NAME_NOT_FOUND },
+               { NTCREATEX_DISP_OVERWRITE_IF,  FILE_ATTRIBUTE_DIRECTORY, 0,
+                 NT_STATUS_OK },
+
+       };
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return false;
+       }
+
+       /* setup some base params. */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname;
+
+       /*
+        * Test the validity checking for create dispositions, which is done
+        * against the requested parameters rather than what's actually on
+        * disk.
+        */
+       for (i=0; i<ARRAY_SIZE(open_funcs); i++) {
+               io.ntcreatex.in.open_disposition = open_funcs[i].open_disp;
+               io.ntcreatex.in.file_attr = open_funcs[i].file_attr;
+               io.ntcreatex.in.create_options = open_funcs[i].create_options;
+               status = smb_raw_open(cli->tree, tctx, &io);
+               if (!NT_STATUS_EQUAL(status, open_funcs[i].correct_status)) {
+                       torture_result(tctx, TORTURE_FAIL,
+                               "(%s) incorrect status %s should be %s "
+                               "(i=%d open_disp=%d)\n",
+                               __location__, nt_errstr(status),
+                               nt_errstr(open_funcs[i].correct_status),
+                               i, (int)open_funcs[i].open_disp);
+                       return false;
+               }
+               /* Close and delete the file. */
+               if (NT_STATUS_IS_OK(status)) {
+                       if (open_funcs[i].create_options != 0) {
+                               /* out attrib should be a directory. */
+                               torture_assert_int_equal(tctx,
+                                   io.ntcreatex.out.attrib,
+                                   FILE_ATTRIBUTE_DIRECTORY, "should have "
+                                   "created a directory");
+
+                               smbcli_close(cli->tree,
+                                   io.ntcreatex.out.file.fnum);
+
+                               /* Make sure unlink fails. */
+                               status = smbcli_unlink(cli->tree, fname);
+                               torture_assert_ntstatus_equal(tctx, status,
+                                   NT_STATUS_FILE_IS_A_DIRECTORY,
+                                   "unlink should fail for a directory");
+
+                               status = smbcli_rmdir(cli->tree, fname);
+                               torture_assert_ntstatus_ok(tctx, status,
+                                   "rmdir failed");
+                       } else {
+                               torture_assert_int_equal(tctx,
+                                   io.ntcreatex.out.attrib,
+                                   FILE_ATTRIBUTE_ARCHIVE, "should not have "
+                                   "created a directory");
+
+                               smbcli_close(cli->tree,
+                                   io.ntcreatex.out.file.fnum);
+
+                               /* Make sure rmdir fails. */
+                               status = smbcli_rmdir(cli->tree, fname);
+                               torture_assert_ntstatus_equal(tctx, status,
+                                   NT_STATUS_NOT_A_DIRECTORY,
+                                   "rmdir should fail for a file");
+
+                               status = smbcli_unlink(cli->tree, fname);
+                               torture_assert_ntstatus_ok(tctx, status,
+                                   "unlink failed");
+                       }
+               }
+       }
+
+       /* Create a file. */
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok(tctx, status, "Failed to create file.");
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       /* Try and open the file with file_attr_dir and check the error. */
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok(tctx, status, "FILE_ATTRIBUTE_DIRECTORY "
+           "doesn't produce a hard failure.");
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       /* Try and open file with createx_option_dir and check the error. */
+       io.ntcreatex.in.file_attr = 0;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_equal(tctx, status, NT_STATUS_NOT_A_DIRECTORY,
+           "NTCREATEX_OPTIONS_DIRECTORY will a file from being opened.");
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       /* Delete the file and move onto directory testing. */
+       smbcli_unlink(cli->tree, fname);
+
+       /* Now try some tests on a directory. */
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.file_attr = 0;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.fname = dname;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok(tctx, status, "Failed to create dir.");
+
+       /* out attrib should be a directory. */
+       torture_assert_int_equal(tctx, io.ntcreatex.out.attrib,
+           FILE_ATTRIBUTE_DIRECTORY, "should have created a directory");
+
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       /* Try and open it with normal attr and check the error. */
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok(tctx, status, "FILE_ATTRIBUTE_NORMAL "
+           "doesn't produce a hard failure.");
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       /* Try and open it with file create_options and check the error. */
+       io.ntcreatex.in.file_attr = 0;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_equal(tctx, status,
+           NT_STATUS_FILE_IS_A_DIRECTORY,
+           "NTCREATEX_OPTIONS_NON_DIRECTORY_FILE should be returned ");
+       smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+
+       smbcli_deltree(cli->tree, BASEDIR);
+
+       return true;
+}
+
+/* basic testing of all RAW_OPEN_* calls
+*/
+struct torture_suite *torture_raw_open(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "open");
+
+       torture_suite_add_1smb_test(suite, "brlocked", test_ntcreatex_brlocked);
+       torture_suite_add_1smb_test(suite, "open", test_open);
+       torture_suite_add_1smb_test(suite, "open-multi", test_raw_open_multi);
+       torture_suite_add_1smb_test(suite, "openx", test_openx);
+       torture_suite_add_1smb_test(suite, "ntcreatex", test_ntcreatex);
+       torture_suite_add_1smb_test(suite, "nttrans-create", test_nttrans_create);
+       torture_suite_add_1smb_test(suite, "t2open", test_t2open);
+       torture_suite_add_1smb_test(suite, "mknew", test_mknew);
+       torture_suite_add_1smb_test(suite, "create", test_create);
+       torture_suite_add_1smb_test(suite, "ctemp", test_ctemp);
+       torture_suite_add_1smb_test(suite, "chained-openx", test_chained);
+       torture_suite_add_1smb_test(suite, "chained-ntcreatex", test_chained_ntcreatex_readx);
+       torture_suite_add_1smb_test(suite, "no-leading-slash", test_no_leading_slash);
+       torture_suite_add_1smb_test(suite, "openx-over-dir", test_openx_over_dir);
+       torture_suite_add_1smb_test(suite, "open-for-delete", test_open_for_delete);
+       torture_suite_add_1smb_test(suite, "opendisp-dir", test_ntcreatex_opendisp_dir);
+       torture_suite_add_1smb_test(suite, "ntcreatedir", test_ntcreatexdir);
+
+       return suite;
+}