[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  0d51bab... Now we behave as Windows does, remove a Samba3 specific test return.
      from  056f24c... Fix bug 7399 - SMB2: QUERY_DIRECTORY is returning invalid values.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0d51bab61efd13d54dd2644380ce24fe9124d789
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 13 21:27:24 2010 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/raw/oplock.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository