From 34059e63c8a644b10cf9a59cca5e67a45053d16e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 21 May 2007 21:17:21 +0000
Subject: r23052: sync with SAMBA_3_0_25 and start updating release notes

---
 source/smbd/reply.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'source/smbd/reply.c')

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index b8d201328b5..37a49756e38 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2421,7 +2421,8 @@ int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int length
 			WRITE_LOCK,
 			WINDOWS_LOCK,
 			False, /* Non-blocking lock. */
-			&status);
+			&status,
+			NULL);
 	TALLOC_FREE(br_lck);
 
 	if (NT_STATUS_V(status)) {
@@ -3426,7 +3427,8 @@ int reply_lock(connection_struct *conn,
 			WRITE_LOCK,
 			WINDOWS_LOCK,
 			False, /* Non-blocking lock. */
-			&status);
+			&status,
+			NULL);
 
 	TALLOC_FREE(br_lck);
 
@@ -5524,6 +5526,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
 			BOOL blocking_lock = lock_timeout ? True : False;
 			BOOL defer_lock = False;
 			struct byte_range_lock *br_lck;
+			uint32 block_smbpid;
 
 			br_lck = do_lock(fsp,
 					lock_pid,
@@ -5532,7 +5535,8 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
 					lock_type,
 					WINDOWS_LOCK,
 					blocking_lock,
-					&status);
+					&status,
+					&block_smbpid);
 
 			if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
 				/* Windows internal resolution for blocking locks seems
@@ -5569,7 +5573,8 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
 							lock_type,
 							WINDOWS_LOCK,
 							offset,
-							count)) {
+							count,
+							block_smbpid)) {
 					TALLOC_FREE(br_lck);
 					END_PROFILE(SMBlockingX);
 					return -1;
-- 
cgit