diff options
| author | Jeremy Allison <jra@samba.org> | 2003-10-10 02:02:02 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-10-10 02:02:02 +0000 |
| commit | beb664306840f2c5ef1e9de9ebd57153037c0349 (patch) | |
| tree | 4a361892fb33553814663953c672d4d4a2ed769f | |
| parent | 9610df161326a378f73fbb9f829f07a3f8e48627 (diff) | |
| download | samba-beb664306840f2c5ef1e9de9ebd57153037c0349.tar.gz samba-beb664306840f2c5ef1e9de9ebd57153037c0349.tar.bz2 samba-beb664306840f2c5ef1e9de9ebd57153037c0349.zip | |
Ensure cancelling a blocking lock returns the correct error message.
Testing with Samba4 RAW-MUX code.
Jeremy.
(This used to be commit 5e6080597fcf225ac9526a4ca973d962a13dd4a8)
| -rw-r--r-- | source3/smbd/blocking.c | 2 |
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); |