1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00

get the error code right in case of a blocking lock timeout.

(This used to be commit 01d35694ae0497ee11a7677eecc597336e6b59ca)
This commit is contained in:
Andrew Tridgell 2002-08-17 23:57:48 +00:00
parent c2831ae82c
commit 28d89d3e66

View File

@ -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;