r12608: Remove some unused #include lines.

[abartlet/samba.git/.git] / source4 / torture / raw / notify.c

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index aec92bf641d58976f84c2c86e20ec18fad08bbed..77c7cb30d2ca5b7745e862bff6e17db1dcdcbe5d 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libcli/raw/libcliraw.h"
 
 #define BASEDIR "\\test_notify"
 
@@ -50,7 +51,7 @@
 /* 
    basic testing of change notify
 */
-BOOL torture_raw_notify(int dummy)
+BOOL torture_raw_notify(void)
 {
        struct smbcli_state *cli;
        BOOL ret = True;
@@ -67,11 +68,8 @@ BOOL torture_raw_notify(int dummy)
 
        mem_ctx = talloc_init("torture_raw_notify");
 
-       /* cleanup */
-       if (smbcli_deltree(cli->tree, BASEDIR) == -1) {
-               printf("Failed to cleanup " BASEDIR "\n");
-               ret = False;
-               goto done;
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return False;
        }
 
        /*
@@ -80,12 +78,12 @@ BOOL torture_raw_notify(int dummy)
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.root_fid = 0;
        io.ntcreatex.in.flags = 0;
-       io.ntcreatex.in.access_mask = SA_RIGHT_FILE_ALL_ACCESS;
+       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        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;
        io.ntcreatex.in.alloc_size = 0;
-       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
        io.ntcreatex.in.fname = BASEDIR;
@@ -135,6 +133,6 @@ done:
        smb_raw_exit(cli->session);
        smbcli_deltree(cli->tree, BASEDIR);
        torture_close_connection(cli);
-       talloc_destroy(mem_ctx);
+       talloc_free(mem_ctx);
        return ret;
 }