s4-torture: Allow the legacy DENY_FCB/DENY_DOS share modes to be ignored

Signed-off-by: Tim Prouty <tprouty@samba.org>

diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index a2ad5e621e520c2c8acb64f17526a17e02459cd8..501647eee49eeaf187a6e867aa634e75802449f7 100644 (file)
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -1439,6 +1439,16 @@ bool torture_denytest1(struct torture_context *tctx,
 
                progress_bar(tctx, i, ARRAY_SIZE(denytable1));
 
+               if (!torture_setting_bool(tctx, "deny_fcb_support", true) &&
+                   (denytable1[i].deny1 == DENY_FCB ||
+                       denytable1[i].deny2 == DENY_FCB))
+                       continue;
+
+               if (!torture_setting_bool(tctx, "deny_dos_support", true) &&
+                   (denytable1[i].deny1 == DENY_DOS ||
+                       denytable1[i].deny2 == DENY_DOS))
+                       continue;
+
                fnum1 = smbcli_open(cli1->tree, fname, 
                                 denytable1[i].mode1,
                                 denytable1[i].deny1);
@@ -1526,6 +1536,16 @@ bool torture_denytest2(struct torture_context *tctx,
 
                progress_bar(tctx, i, ARRAY_SIZE(denytable1));
 
+               if (!torture_setting_bool(tctx, "deny_fcb_support", true) &&
+                   (denytable1[i].deny1 == DENY_FCB ||
+                       denytable1[i].deny2 == DENY_FCB))
+                       continue;
+
+               if (!torture_setting_bool(tctx, "deny_dos_support", true) &&
+                   (denytable1[i].deny1 == DENY_DOS ||
+                       denytable1[i].deny2 == DENY_DOS))
+                       continue;
+
                fnum1 = smbcli_open(cli1->tree, fname, 
                                 denytable2[i].mode1,
                                 denytable2[i].deny1);

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 8742a8c820466147984fb3aa9e4a42125f7b299c..747911e5a9115de5e9a86ad0f341bfc3efb1cdb2 100644 (file)
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -546,6 +546,8 @@ int main(int argc,char *argv[])
                    "false");
                lp_set_cmdline(cmdline_lp_ctx, "torture:2_step_break_to_none",
                    "true");
+               lp_set_cmdline(cmdline_lp_ctx, "torture:deny_dos_support", "false");
+               lp_set_cmdline(cmdline_lp_ctx, "torture:deny_fcb_support", "false");
        }
 
        if (max_runtime) {