diff options
| author | Jeremy Allison <jra@samba.org> | 2014-07-02 17:25:22 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-03 21:41:12 +0200 |
| commit | 517fa80bd385c6adcfee03ea6b25599013ad88f5 (patch) | |
| tree | 660b773e0cd70f117d147fa1f0c1152fed41df2d /source3/smbd/blocking.c | |
| parent | 4126f9716b82fa8cf24e1e9497485f18eac4f8a6 (diff) | |
| download | samba-517fa80bd385c6adcfee03ea6b25599013ad88f5.tar.gz | |
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 <jra@samba.org>
Reviewed-by: Volker Lendecke <Volker.Lendecke@SerNet.DE>
Diffstat (limited to 'source3/smbd/blocking.c')
| -rw-r--r-- | source3/smbd/blocking.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 5d198fc1f2c..b7445008d13 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. |