diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-08-17 23:57:48 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-08-17 23:57:48 +0000 |
| commit | 28d89d3e66328213d87aa9a247c24adfc579d21c (patch) | |
| tree | f0bbd279b57b07395657dbc053c90af2433675bf /source3 | |
| parent | c2831ae82c4b17d27651776ee599741c20f0e91f (diff) | |
| download | samba-28d89d3e66328213d87aa9a247c24adfc579d21c.tar.gz samba-28d89d3e66328213d87aa9a247c24adfc579d21c.tar.bz2 samba-28d89d3e66328213d87aa9a247c24adfc579d21c.zip | |
get the error code right in case of a blocking lock timeout.
(This used to be commit 01d35694ae0497ee11a7677eecc597336e6b59ca)
Diffstat (limited to 'source3')
| -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 cb69b60144..72cf3e59b6 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -584,7 +584,7 @@ void process_blocking_lock_queue(time_t t) DEBUG(5,("process_blocking_lock_queue: pending lock fnum = %d for file %s timed out.\n", fsp->fnum, fsp->fsp_name )); - blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED); + blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT); free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev)); blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue)); continue; |