summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-10 02:02:05 +0000
committerJeremy Allison <jra@samba.org>2003-10-10 02:02:05 +0000
commit6af214dbb0bf9505483fd225b097ad695eed9361 (patch)
treeb210e7dd69cdfe6b6a0e2dd3f34329f26356f1f4 /source3/smbd
parente7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae (diff)
downloadsamba-6af214dbb0bf9505483fd225b097ad695eed9361.tar.gz
samba-6af214dbb0bf9505483fd225b097ad695eed9361.tar.bz2
samba-6af214dbb0bf9505483fd225b097ad695eed9361.zip
Ensure cancelling a blocking lock returns the correct error message.
Testing with Samba4 RAW-MUX code. Jeremy. (This used to be commit 533847c95d475921b0421ae113f52c44979939d2)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 5c6ddbc6b7..f43790bfe0 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -555,7 +555,7 @@ void remove_pending_lock_requests_by_mid(int mid)
DEBUG(10,("remove_pending_lock_requests_by_mid - removing request type %d for \
file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
- blocking_lock_reply_error(blr,NT_STATUS_CANCELLED);
+ blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
blr->offset, blr->count, True, NULL, NULL);