From: Jeremy Allison <jra@samba.org>
Date: Fri, 14 May 2010 04:27:24 +0000 (-0700)
Subject: Now we behave as Windows does, remove a Samba3 specific test return.
X-Git-Tag: samba-3.6.0pre1~2024
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d51bab61efd13d54dd2644380ce24fe9124d789;p=thirdparty%2Fsamba.git

Now we behave as Windows does, remove a Samba3 specific test return.

Jeremy.
---

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 8bf3a2d97f2..5ae396412e9 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 */