svn commit: samba r6163 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-04-01 00:54:55 +0000 (Fri, 01 Apr 2005)
New Revision: 6163

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6163

Log:
Well I never, all this time the t2open code was incorrectly decting
oplock requests and no one noticed. Hmmm. Don't think this is a commonly
used codepath :-).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2005-04-01 00:54:54 UTC (rev 6162)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2005-04-01 00:54:55 UTC (rev 6163)
@@ -744,7 +744,11 @@
 
 	open_mode = SVAL(params, 2);
 	open_attr = SVAL(params,6);
-	oplock_request = (((SVAL(params,0)|(1<<1))>>1) | ((SVAL(params,0)|(1<<2))>>1));
+        oplock_request = (SVAL(params,0) & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
+        if (oplock_request) {
+                oplock_request |= (SVAL(params,0) & REQUEST_BATCH_OPLOCK) ? BATCH_OPLOCK : 0;
+        }
+
 #if 0
 	return_additional_info = BITSETW(params,0);
 	open_sattr = SVAL(params, 4);