svn commit: samba r15966 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2006-05-30 19:58:37 +0000 (Tue, 30 May 2006)
New Revision: 15966

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

Log:
Sync up HEAD with 3.0.
Jeremy.

Modified:
   trunk/source/smbd/open.c


Changeset:
Modified: trunk/source/smbd/open.c
===================================================================
--- trunk/source/smbd/open.c	2006-05-30 19:58:16 UTC (rev 15965)
+++ trunk/source/smbd/open.c	2006-05-30 19:58:37 UTC (rev 15966)
@@ -686,17 +686,14 @@
 			   procid_str_static(&exclusive->pid)));
 		exclusive->op_mid = get_current_mid();
 
-		if (oplock_request & FORCE_OPLOCK_BREAK_TO_NONE) {
-			/* Send the message with this bit set. */
-			exclusive->op_type |= FORCE_OPLOCK_BREAK_TO_NONE;
-		}
-
 		/* Create the message. */
 		share_mode_entry_to_message(msg, exclusive);
 
-		/* And remove it again - we don't want this stored. */
+		/* Add in the FORCE_OPLOCK_BREAK_TO_NONE bit in the message if set. We don't
+		   want this set in the share mode struct pointed to by lck. */
+
 		if (oplock_request & FORCE_OPLOCK_BREAK_TO_NONE) {
-			exclusive->op_type &= ~FORCE_OPLOCK_BREAK_TO_NONE;
+			SSVAL(msg,6,exclusive->op_type | FORCE_OPLOCK_BREAK_TO_NONE);
 		}
 
 		become_root();