Add a test that shows the difference between Windows and Samba with respect to Delete...
authorRichard Sharpe <realrichardsharpe@gmail.com>
Fri, 5 Apr 2013 00:15:30 +0000 (17:15 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 15 Apr 2013 22:46:53 +0000 (00:46 +0200)
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Apr 16 00:46:54 CEST 2013 on sn-devel-104

source4/torture/smb2/delete-on-close.c [new file with mode: 0644]
source4/torture/smb2/smb2.c
source4/torture/smb2/wscript_build

diff --git a/source4/torture/smb2/delete-on-close.c b/source4/torture/smb2/delete-on-close.c
new file mode 100644 (file)
index 0000000..0eef8fa
--- /dev/null
@@ -0,0 +1,537 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   test delete-on-close in more detail
+
+   Copyright (C) Richard Sharpe, 2013
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "unistd.h"
+#include "includes.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
+#include "torture/torture.h"
+#include "torture/util.h"
+#include "torture/smb2/proto.h"
+#include "libcli/security/security.h"
+#include "librpc/gen_ndr/ndr_security.h"
+
+#define DNAME "test_dir"
+#define FNAME DNAME "\\test_create.dat"
+
+#define CHECK_STATUS(status, correct) do { \
+       if (!NT_STATUS_EQUAL(status, correct)) { \
+               torture_result(tctx, TORTURE_FAIL, \
+                       "(%s) Incorrect status %s - should be %s\n", \
+                        __location__, nt_errstr(status), nt_errstr(correct)); \
+               return false; \
+       }} while (0)
+
+static bool create_dir(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       struct smb2_create io;
+       struct smb2_handle handle;
+       union smb_fileinfo q;
+       union smb_setfileinfo set;
+       struct security_descriptor *sd, *sd_orig;
+       const char *owner_sid;
+       uint32_t perms = 0;
+
+       torture_comment(tctx, "Creating Directory for testing: %s\n", DNAME);
+
+       ZERO_STRUCT(io);
+       io.level = RAW_OPEN_SMB2;
+       io.in.create_flags = 0;
+       io.in.desired_access =
+               SEC_STD_READ_CONTROL |
+               SEC_STD_WRITE_DAC |
+               SEC_STD_WRITE_OWNER;
+       io.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY;
+       io.in.share_access =
+               NTCREATEX_SHARE_ACCESS_READ |
+               NTCREATEX_SHARE_ACCESS_WRITE;
+       io.in.alloc_size = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.in.impersonation_level = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.in.security_flags = 0;
+       io.in.fname = DNAME;
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       handle = io.out.file.handle;
+
+       torture_comment(tctx, "get the original sd\n");
+       q.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
+       q.query_secdesc.in.file.handle = handle;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb2_getinfo_file(tree, tctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       sd_orig = q.query_secdesc.out.sd;
+
+       owner_sid = dom_sid_string(tctx, sd_orig->owner_sid);
+
+       /*
+        * We create an SD that allows us to do most things but we do not
+        * get DELETE and DELETE CHILD access!
+        */
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_WRITE_OWNER |
+               SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_TRAVERSE | SEC_DIR_WRITE_EA | 
+               SEC_FILE_READ_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA | SEC_FILE_READ_DATA;
+
+       torture_comment(tctx, "Setting permissions on dir to 0x1e01bf\n");
+       sd = security_descriptor_dacl_create(tctx,
+                                       0, owner_sid, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       perms,
+                                       SEC_ACE_FLAG_OBJECT_INHERIT,
+                                       NULL);
+
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.in.file.handle = handle;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       set.set_secdesc.in.sd = sd;
+
+       status = smb2_setinfo_file(tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, handle);
+
+       return true;
+}
+
+static bool set_dir_delete_perms(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       struct smb2_create io;
+       struct smb2_handle handle;
+       union smb_fileinfo q;
+       union smb_setfileinfo set;
+       struct security_descriptor *sd, *sd_orig;
+       const char *owner_sid;
+       uint32_t perms = 0;
+
+       torture_comment(tctx, "Opening Directory for setting new SD: %s\n", DNAME);
+
+       ZERO_STRUCT(io);
+       io.level = RAW_OPEN_SMB2;
+       io.in.create_flags = 0;
+       io.in.desired_access =
+               SEC_STD_READ_CONTROL |
+               SEC_STD_WRITE_DAC |
+               SEC_STD_WRITE_OWNER;
+       io.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY;
+       io.in.share_access =
+               NTCREATEX_SHARE_ACCESS_READ |
+               NTCREATEX_SHARE_ACCESS_WRITE;
+       io.in.alloc_size = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.in.impersonation_level = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.in.security_flags = 0;
+       io.in.fname = DNAME;
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       handle = io.out.file.handle;
+
+       torture_comment(tctx, "get the original sd\n");
+       q.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
+       q.query_secdesc.in.file.handle = handle;
+       q.query_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       status = smb2_getinfo_file(tree, tctx, &q);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       sd_orig = q.query_secdesc.out.sd;
+
+       owner_sid = dom_sid_string(tctx, sd_orig->owner_sid);
+
+       /*
+        * We create an SD that allows us to do most things including
+        * get DELETE and DELETE CHILD access!
+        */
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_WRITE_OWNER |
+               SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_TRAVERSE | SEC_DIR_WRITE_EA | 
+               SEC_FILE_READ_EA | SEC_FILE_APPEND_DATA |
+               SEC_DIR_DELETE_CHILD | SEC_STD_DELETE |
+               SEC_FILE_WRITE_DATA | SEC_FILE_READ_DATA;
+
+       torture_comment(tctx, "Setting permissions on dir to 0x%0x\n", perms);
+       sd = security_descriptor_dacl_create(tctx,
+                                       0, owner_sid, NULL,
+                                       owner_sid,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       perms,
+                                       0,
+                                       NULL);
+
+       set.set_secdesc.level = RAW_SFILEINFO_SEC_DESC;
+       set.set_secdesc.in.file.handle = handle;
+       set.set_secdesc.in.secinfo_flags = SECINFO_DACL | SECINFO_OWNER;
+       set.set_secdesc.in.sd = sd;
+
+       status = smb2_setinfo_file(tree, &set);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, handle);
+
+       return true;
+}
+
+static bool test_doc_overwrite_if(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on non-existent file (OVERWRITE_IF)\n");
+       torture_comment(tctx, "We expect NT_STATUS_OK\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OVERWRITE_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Check it was deleted */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0;
+       io.in.fname              = FNAME;
+
+       torture_comment(tctx, "Testing if the file was deleted when closed\n");
+       torture_comment(tctx, "We expect NT_STATUS_OBJECT_NAME_NOT_FOUND\n");
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+       return true;
+}
+
+static bool test_doc_overwrite_if_exist(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       /* And set the SEC Descriptor appropriately */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on existing file (OVERWRITE_IF)\n");
+       torture_comment(tctx, "We expect NT_STATUS_ACCESS_DENIED\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       /* First, create this file ... */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OVERWRITE_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0x0;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Next, try to open it for Delete On Close */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OVERWRITE_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       return true;
+}
+
+static bool test_doc_create(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on non-existent file (CREATE) \n");
+       torture_comment(tctx, "We expect NT_STATUS_OK\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_CREATE;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Check it was deleted */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0;
+       io.in.fname              = FNAME;
+
+       torture_comment(tctx, "Testing if the file was deleted when closed\n");
+       torture_comment(tctx, "We expect NT_STATUS_OBJECT_NAME_NOT_FOUND\n");
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+       return true;
+}
+
+static bool test_doc_create_exist(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on non-existent file (CREATE) \n");
+       torture_comment(tctx, "We expect NT_STATUS_OBJECT_NAME_COLLISION\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       /* First, create the file */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_CREATE;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0x0;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Next, try to open it for Delete on Close */
+       status = smb2_util_close(tree, io.out.file.handle);
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_CREATE;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       return true;
+}
+
+static bool test_doc_create_if(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on non-existent file (OPEN_IF)\n");
+       torture_comment(tctx, "We expect NT_STATUS_OK\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Check it was deleted */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0;
+       io.in.fname              = FNAME;
+
+       torture_comment(tctx, "Testing if the file was deleted when closed\n");
+       torture_comment(tctx, "We expect NT_STATUS_OBJECT_NAME_NOT_FOUND\n");
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+       return true;
+}
+
+static bool test_doc_create_if_exist(struct torture_context *tctx, struct smb2_tree *tree)
+{
+       struct smb2_create io;
+       NTSTATUS status;
+       uint32_t perms = 0;
+
+       /* File should not exist for this first test, so make sure */
+       set_dir_delete_perms(tctx, tree);
+
+       smb2_deltree(tree, DNAME);
+
+       create_dir(tctx, tree);
+
+       torture_comment(tctx, "Create file with DeleteOnClose on existing file (OPEN_IF)\n");
+       torture_comment(tctx, "We expect NT_STATUS_ACCESS_DENIED\n");
+
+       perms = SEC_STD_SYNCHRONIZE | SEC_STD_READ_CONTROL | SEC_STD_DELETE | 
+               SEC_DIR_WRITE_ATTRIBUTE | SEC_DIR_READ_ATTRIBUTE | 
+               SEC_DIR_WRITE_EA | SEC_FILE_APPEND_DATA |
+               SEC_FILE_WRITE_DATA;
+
+       /* Create the file first */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = perms;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = 0x0;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       /* Now try to create it for delete on close */
+       ZERO_STRUCT(io);
+       io.in.desired_access     = 0x130196;
+       io.in.file_attributes    = 0;
+       io.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.in.share_access       = NTCREATEX_SHARE_ACCESS_DELETE;
+       io.in.create_options     = NTCREATEX_OPTIONS_DELETE_ON_CLOSE | 
+                                  NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.in.fname              = FNAME;
+
+       status = smb2_create(tree, tctx, &io);
+       CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+
+       status = smb2_util_close(tree, io.out.file.handle);
+
+       return true;
+}
+
+/*
+ *  Extreme testing of Delete On Close and permissions
+ */
+struct torture_suite *torture_smb2_doc_init(void)
+{
+       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "delete-on-close-perms");
+
+       torture_suite_add_1smb2_test(suite, "OVERWRITE_IF", test_doc_overwrite_if);
+       torture_suite_add_1smb2_test(suite, "OVERWRITE_IF Existing", test_doc_overwrite_if_exist);
+       torture_suite_add_1smb2_test(suite, "CREATE", test_doc_create);
+       torture_suite_add_1smb2_test(suite, "CREATE Existing", test_doc_create_exist);
+       torture_suite_add_1smb2_test(suite, "CREATE_IF", test_doc_create_if);
+       torture_suite_add_1smb2_test(suite, "CREATE_IF Existing", test_doc_create_if_exist);
+
+       suite->description = talloc_strdup(suite, "SMB2-Delete-on-Close-Perms tests");
+
+       return suite;
+}
index 65dc92466213174e3c5b37bec421ad77dcdcd9b3..f6a31633af9b5ec96a0876fa0587f849164a9858 100644 (file)
@@ -169,6 +169,8 @@ NTSTATUS torture_smb2_init(void)
        torture_suite_add_1smb2_test(suite, "hold-oplock", test_smb2_hold_oplock);
        torture_suite_add_suite(suite, torture_smb2_session_init());
 
+       torture_suite_add_suite(suite, torture_smb2_doc_init());
+
        suite->description = talloc_strdup(suite, "SMB2-specific tests");
 
        torture_register_suite(suite);
index d60c5d2ddb4eabed5e95578fe52af6d12e74c293..42393c433dd088cce2db640cbb33664a71ab37ed 100644 (file)
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('TORTURE_SMB2',
        source='''connect.c scan.c util.c getinfo.c setinfo.c lock.c notify.c
        smb2.c durable_open.c durable_v2_open.c oplock.c dir.c lease.c create.c
        acls.c read.c compound.c streams.c ioctl.c rename.c
-       session.c ''',
+       session.c delete-on-close.c''',
        subsystem='smbtorture',
        deps='LIBCLI_SMB2 POPT_CREDENTIALS torture NDR_IOCTL',
        internal_module=True,