s4: torture: Test all combinations of directory open with existing directory to ensur...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13358

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Mar 29 23:13:42 CEST 2018 on sn-devel-144

diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 744ac6802d5fc1c36208ecf4caae564d3252eb1a..6596985a4e7ea5e19c4761aa342eb71cccbaa5e1 100644 (file)
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -2419,6 +2419,71 @@ static bool deltest25(struct torture_context *tctx,
        return true;
 }
 
+/* Test 25a... */
+static bool deltest25a(struct torture_context *tctx,
+               struct smbcli_state *cli1,
+               struct smbcli_state *cli2)
+{
+       int fnum1 = -1;
+       NTSTATUS status;
+       uint32_t disps[4] = {
+                       NTCREATEX_DISP_OVERWRITE_IF,
+                       NTCREATEX_DISP_OPEN,
+                       NTCREATEX_DISP_OVERWRITE,
+                       NTCREATEX_DISP_OPEN_IF};
+
+       unsigned int i;
+
+       del_clean_area(cli1, cli2);
+
+       /* Create the directory, and try with open calls. */
+       status = smbcli_mkdir(cli1->tree, dname);
+       torture_assert_ntstatus_ok(tctx,
+               status,
+               talloc_asprintf(tctx, "mkdir of %s failed %s",
+               dname,
+               smbcli_errstr(cli1->tree)));
+
+       for (i = 0; i < sizeof(disps)/sizeof(disps[0]); i++) {
+               fnum1 = smbcli_nt_create_full(cli1->tree, dname, 0,
+                               SEC_FILE_READ_DATA,
+                               FILE_ATTRIBUTE_DIRECTORY,
+                               NTCREATEX_SHARE_ACCESS_NONE,
+                               disps[i],
+                               NTCREATEX_OPTIONS_DIRECTORY|
+                               NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
+
+               torture_assert(tctx, fnum1 == -1,
+                       talloc_asprintf(tctx, "open of %s succeeded "
+                               "should have failed!",
+                       dname));
+
+               /* Must fail with NT_STATUS_INVALID_PARAMETER. */
+               status = smbcli_nt_error(cli1->tree);
+               torture_assert_ntstatus_equal(tctx,
+                       status,
+                       NT_STATUS_INVALID_PARAMETER,
+                       talloc_asprintf(tctx, "create of %s should return "
+                               "NT_STATUS_INVALID_PARAMETER, got %s",
+                       dname,
+                       smbcli_errstr(cli1->tree)));
+
+               /*
+                * This should succeed - the directory
+                * should not have been deleted.
+                */
+               status = smbcli_getatr(cli1->tree, dname, NULL, NULL, NULL);
+               torture_assert_ntstatus_ok(tctx,
+                       status,
+                       talloc_asprintf(tctx, "getattr of %s failed %s",
+                       fname,
+                       smbcli_errstr(cli1->tree)));
+       }
+
+       del_clean_area(cli1, cli2);
+       return true;
+}
+
 /*
   Test delete on close semantics.
  */
@@ -2462,6 +2527,7 @@ struct torture_suite *torture_test_delete(TALLOC_CTX *ctx)
        torture_suite_add_2smb_test(suite, "deltest23", deltest23);
        torture_suite_add_simple_test(suite, "deltest24", deltest24);
        torture_suite_add_2smb_test(suite, "deltest25", deltest25);
+       torture_suite_add_2smb_test(suite, "deltest25a", deltest25a);
 
        return suite;
 }