diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-13 21:27:24 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-13 21:27:24 -0700 |
| commit | 0d51bab61efd13d54dd2644380ce24fe9124d789 (patch) | |
| tree | 85c3ce42b583e7cec432ca72059fa76bcd64648f /source4/torture/raw/oplock.c | |
| parent | 056f24ce24ab395cb6fff15cb068c8d8b1affef9 (diff) | |
| download | samba-0d51bab61efd13d54dd2644380ce24fe9124d789.tar.gz samba-0d51bab61efd13d54dd2644380ce24fe9124d789.tar.bz2 samba-0d51bab61efd13d54dd2644380ce24fe9124d789.zip | |
Now we behave as Windows does, remove a Samba3 specific test return.
Jeremy.
Diffstat (limited to 'source4/torture/raw/oplock.c')
| -rw-r--r-- | source4/torture/raw/oplock.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 8bf3a2d97f..5ae396412e 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -2933,13 +2933,19 @@ static bool test_raw_oplock_batch22(struct torture_context *tctx, struct smbcli_ smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_given, cli1->tree); status = smb_raw_open(cli1->tree, tctx, &io); CHECK_STATUS(tctx, status, NT_STATUS_OK); +#if 0 + /* Samba 3.6.0 and above behave as Windows. */ if (TARGET_IS_SAMBA3(tctx)) { /* samba3 doesn't grant additional oplocks to bad clients. */ CHECK_VAL(io.ntcreatex.out.oplock_level, NO_OPLOCK_RETURN); } else { CHECK_VAL(io.ntcreatex.out.oplock_level, - LEVEL_II_OPLOCK_RETURN); + LEVEL_II_OPLOCK_RETURN); } +#else + CHECK_VAL(io.ntcreatex.out.oplock_level, + LEVEL_II_OPLOCK_RETURN); +#endif torture_wait_for_oplock_break(tctx); te = (int)timeval_elapsed(&tv); /* it should come in without delay */ |