diff options
| author | Jeremy Allison <jra@samba.org> | 2003-10-10 02:02:05 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-10-10 02:02:05 +0000 |
| commit | 533847c95d475921b0421ae113f52c44979939d2 (patch) | |
| tree | b2260c7284cb1274656c3ec98602200dce286ed5 /source | |
| parent | 7622a9dbbded8d07f976ec965adca5e92de3d2b0 (diff) | |
| download | samba-533847c95d475921b0421ae113f52c44979939d2.tar.gz samba-533847c95d475921b0421ae113f52c44979939d2.tar.xz samba-533847c95d475921b0421ae113f52c44979939d2.zip | |
Ensure cancelling a blocking lock returns the correct error message.
Testing with Samba4 RAW-MUX code.
Jeremy.
Diffstat (limited to 'source')
| -rw-r--r-- | source/smbd/blocking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c index 5c6ddbc6b7e..f43790bfe03 100644 --- a/source/smbd/blocking.c +++ b/source/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); |