diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 21:47:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 21:47:45 +0100 |
| commit | 5076c64d43c68a028ac944c336715b4cb277365f (patch) | |
| tree | e88fc16979b75b5b30377e84b76ebb1b87e01591 /source4/torture/raw | |
| parent | 6998ef4fe021ebf40f63c2191d3259888a8ad7f4 (diff) | |
| parent | 13eefa7c435cb5ac656f662c78260a82caf43180 (diff) | |
| download | samba-5076c64d43c68a028ac944c336715b4cb277365f.tar.gz samba-5076c64d43c68a028ac944c336715b4cb277365f.tar.bz2 samba-5076c64d43c68a028ac944c336715b4cb277365f.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/torture/raw')
| -rw-r--r-- | source4/torture/raw/chkpath.c | 2 | ||||
| -rw-r--r-- | source4/torture/raw/oplock.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c index b66839b997..a39993489b 100644 --- a/source4/torture/raw/chkpath.c +++ b/source4/torture/raw/chkpath.c @@ -306,7 +306,7 @@ static bool test_chkpath_names(struct smbcli_state *cli, struct torture_context case '?':/*0x3F*/ case '|':/*0x7C*/ if (i == '/' && - torture_setting_bool(tctx, "samba3", true)) { + torture_setting_bool(tctx, "samba3", false)) { /* samba 3 handles '/' as '\\' */ break; } diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 4ffb24eb03..f0afee26cc 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -2632,10 +2632,6 @@ static bool test_raw_oplock_batch23(struct torture_context *tctx, struct smbcli_ uint16_t fnum=0, fnum2=0,fnum3=0; struct smbcli_state *cli3 = NULL; - if (torture_setting_bool(tctx, "samba3", false)) { - torture_skip(tctx, "BATCH23 disabled against samba3\n"); - } - if (!torture_setup_dir(cli1, BASEDIR)) { return false; } |