r8058: added testing of delete on close for files and directories

(This used to be commit 214e51b3c8021dfe31ad951603bae64fa281b0f8)

diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 5874da6ef7b7949fc9ee75cade7a42de9fcfd4cc..e8808957c64fa78eef545c958f59e696188c7f17 100644 (file)
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -164,6 +164,91 @@ done:
 }
 
 
+/*
+  test delete on close 
+*/
+static BOOL test_delete_on_close(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+{
+       struct smb_unlink io;
+       struct smb_rmdir dio;
+       NTSTATUS status;
+       BOOL ret = True;
+       int fnum;
+       const char *fname = BASEDIR "\\test.txt";
+       const char *dname = BASEDIR "\\test.dir";
+       union smb_setfileinfo sfinfo;
+
+       if (!torture_setup_dir(cli, BASEDIR)) {
+               return False;
+       }
+
+       dio.in.path = dname;
+
+       io.in.pattern = fname;
+       io.in.attrib = 0;
+       status = smb_raw_unlink(cli->tree, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+       printf("Testing with delete_on_close 0\n");
+       fnum = create_complex_file(cli, mem_ctx, fname);
+
+       sfinfo.disposition_info.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
+       sfinfo.disposition_info.file.fnum = fnum;
+       sfinfo.disposition_info.in.delete_on_close = 0;
+       status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+
+       status = smb_raw_unlink(cli->tree, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       printf("Testing with delete_on_close 1\n");
+       fnum = create_complex_file(cli, mem_ctx, fname);
+       sfinfo.disposition_info.file.fnum = fnum;
+       sfinfo.disposition_info.in.delete_on_close = 1;
+       status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+
+       status = smb_raw_unlink(cli->tree, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+
+       printf("Testing with directory and delete_on_close 0\n");
+       fnum = create_directory_handle(cli->tree, dname);
+
+       sfinfo.disposition_info.level = RAW_SFILEINFO_DISPOSITION_INFORMATION;
+       sfinfo.disposition_info.file.fnum = fnum;
+       sfinfo.disposition_info.in.delete_on_close = 0;
+       status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+
+       status = smb_raw_rmdir(cli->tree, &dio);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       printf("Testing with directory delete_on_close 1\n");
+       fnum = create_directory_handle(cli->tree, dname);
+       sfinfo.disposition_info.file.fnum = fnum;
+       sfinfo.disposition_info.in.delete_on_close = 1;
+       status = smb_raw_setfileinfo(cli->tree, &sfinfo);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       smbcli_close(cli->tree, fnum);
+
+       status = smb_raw_rmdir(cli->tree, &dio);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+done:
+       smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR);
+       return ret;
+}
+
+
 /* 
    basic testing of unlink calls
 */
@@ -179,9 +264,8 @@ BOOL torture_raw_unlink(void)
 
        mem_ctx = talloc_init("torture_raw_unlink");
 
-       if (!test_unlink(cli, mem_ctx)) {
-               ret = False;
-       }
+       ret &= test_unlink(cli, mem_ctx);
+       ret &= test_delete_on_close(cli, mem_ctx);
 
        torture_close_connection(cli);
        talloc_free(mem_ctx);

diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index e474c06c6b79c9182e543723e4d8ed31c886c791..753f36164fd705bff37b543537aa93ebdfffa018 100644 (file)
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -53,7 +53,7 @@ int create_directory_handle(struct smbcli_tree *tree, const char *dname)
        io.generic.level = RAW_OPEN_NTCREATEX;
        io.ntcreatex.in.root_fid = 0;
        io.ntcreatex.in.flags = 0;
-       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_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;