From 76dd28b48ba0c6618c0df8833c30ab5e81247cd8 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 2 Jul 2014 17:25:22 -0700 Subject: [PATCH] s3: smbd: Locking - convert to using utility macro used elsewhere. Bug #10684 - SMB1 blocking locks can fail notification on unlock, causing client timeout. https://bugzilla.samba.org/show_bug.cgi?id=10684 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke (cherry picked from commit 517fa80bd385c6adcfee03ea6b25599013ad88f5) --- source3/smbd/blocking.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 5f6dda318e6..54ce016aadd 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -500,8 +500,7 @@ static bool process_lockingX(struct blocking_lock_record *blr) return True; } - if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) && - !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) { + if (!ERROR_WAS_LOCK_DENIED(status)) { /* * We have other than a "can't get lock" * error. Free any locks we had and return an error. -- 2.11.4.GIT