summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Loafman <zachary.loafman@isilon.com>2009-11-09 18:32:06 +0000
committerTim Prouty <tprouty@samba.org>2009-12-03 19:07:54 -0800
commit60d9828ade304dc7aa9b01f1be1dfea86b04248e (patch)
tree44d521424dfa06c38054b963a7a8ff02d39ae71e
parent5c857768d1415c4e70a9b7a96b8a9de1ec8efdee (diff)
downloadsamba-60d9828ade304dc7aa9b01f1be1dfea86b04248e.tar.gz
samba-60d9828ade304dc7aa9b01f1be1dfea86b04248e.tar.bz2
samba-60d9828ade304dc7aa9b01f1be1dfea86b04248e.zip
s4-torture: Allow the legacy DENY_FCB/DENY_DOS share modes to be ignored
Signed-off-by: Tim Prouty <tprouty@samba.org>
-rw-r--r--source4/torture/basic/denytest.c20
-rw-r--r--source4/torture/smbtorture.c2
2 files changed, 22 insertions, 0 deletions
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index a2ad5e621e..501647eee4 100644
--- 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 8742a8c820..747911e5a9 100644
--- 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) {