From 28d89d3e66328213d87aa9a247c24adfc579d21c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 17 Aug 2002 23:57:48 +0000 Subject: get the error code right in case of a blocking lock timeout. (This used to be commit 01d35694ae0497ee11a7677eecc597336e6b59ca) --- source3/smbd/blocking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/smbd') 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; -- cgit