unlink2 test

Signed-off-by: Christian Ambach <ambi@samba.org>

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 5fba9b08127a2109cf4645cdfb4b799a223ec114..91914f7d11c6cce4798edfa45a48028894e3206a 100644 (file)
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1889,6 +1889,7 @@ NTSTATUS torture_base_init(void)
        torture_suite_add_2smb_test(suite, "fdpass", run_fdpasstest);
        torture_suite_add_suite(suite, torture_base_locktest(suite));
        torture_suite_add_1smb_test(suite, "unlink", torture_unlinktest);
+       torture_suite_add_1smb_test(suite, "unlink2", torture_unlinktest2);
        torture_suite_add_1smb_test(suite, "attr",   run_attrtest);
        torture_suite_add_1smb_test(suite, "trans2", run_trans2test);
        torture_suite_add_1smb_test(suite, "birthtime", run_birthtimetest);

diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index dee71bd7af30a7c61d37a67a3a555bf62650bb5e..1fc2a4e5f39a4d6e6e877e96ef81e2be772201b8 100644 (file)
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -88,4 +88,54 @@ bool torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli)
        return correct;
 }
 
+bool torture_unlinktest2(struct torture_context *tctx, struct smbcli_state *cli)
+{
+       const char *fname = BASEDIR "\\unlink.tst";
+       bool correct = true;
+       union smb_open io;
+       union smb_unlink un;
+       NTSTATUS status;
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR),
+                      talloc_asprintf(tctx, "Failed setting up %s", BASEDIR));
+
+       cli->session->pid = 1;
 
+       torture_comment(tctx,
+                       "Testing unlink after ntcreatex with DELETE access\n");
+
+       io.ntcreatex.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_REQUEST_OPLOCK;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_CREATE;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_IMPERSONATION;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_DELETE |
+                                      NTCREATEX_SHARE_ACCESS_READ |
+                                      NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.access_mask  = SEC_GENERIC_WRITE;
+
+       status = smb_raw_open(cli->tree, cli, &io);
+       torture_assert_ntstatus_ok(tctx, status,
+                       talloc_asprintf(tctx, "failed to open %s", fname));
+
+       ZERO_STRUCT(un);
+       un.unlink.in.pattern = fname;
+       un.unlink.in.attrib = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM |
+                             FILE_ATTRIBUTE_READONLY;
+
+
+       status = smb_raw_unlink(cli->tree, &un);
+
+       torture_assert(tctx, !NT_STATUS_IS_OK(status),
+               "server allowed unlink on an open file");
+
+       correct = check_error(__location__, cli, ERRDOS, ERRbadshare,
+                                     NT_STATUS_SHARING_VIOLATION);
+
+       return correct;
+}