diff options
author | Andrew Bartlett <abartlet@samba.org> | 2010-01-11 17:10:32 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2010-01-11 17:10:32 +1100 |
commit | c32b0b6b0249e9f636667b779096b80c97038515 (patch) | |
tree | 847b2399221d1219b3dc58c8209fc3adfb70c403 /source4/torture/smbtorture.c | |
parent | f6b10596ca7307b63b852d39229d2f2bcfb09e4a (diff) | |
parent | 5323fe99c30bad099645711feac5f2a8979a1ee1 (diff) | |
download | samba-c32b0b6b0249e9f636667b779096b80c97038515.tar.gz samba-c32b0b6b0249e9f636667b779096b80c97038515.tar.bz2 samba-c32b0b6b0249e9f636667b779096b80c97038515.zip |
Merge remote branch 'origin/master' into alpha11release
Diffstat (limited to 'source4/torture/smbtorture.c')
-rw-r--r-- | source4/torture/smbtorture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 8e0a25b032..53e860a144 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -550,8 +550,11 @@ int main(int argc,char *argv[]) lp_set_cmdline(cmdline_lp_ctx, "torture:onefs", "true"); lp_set_cmdline(cmdline_lp_ctx, "torture:openx_deny_dos_support", "false"); + lp_set_cmdline(cmdline_lp_ctx, "torture:range_not_locked_on_file_close", "false"); lp_set_cmdline(cmdline_lp_ctx, "torture:sacl_support", "false"); lp_set_cmdline(cmdline_lp_ctx, "torture:ea_support", "false"); + lp_set_cmdline(cmdline_lp_ctx, "torture:smbexit_pdu_support", + "false"); lp_set_cmdline(cmdline_lp_ctx, "torture:smblock_pdu_support", "false"); lp_set_cmdline(cmdline_lp_ctx, "torture:2_step_break_to_none", |