From beb664306840f2c5ef1e9de9ebd57153037c0349 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 10 Oct 2003 02:02:02 +0000 Subject: Ensure cancelling a blocking lock returns the correct error message. Testing with Samba4 RAW-MUX code. Jeremy. (This used to be commit 5e6080597fcf225ac9526a4ca973d962a13dd4a8) --- source3/smbd/blocking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit