From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 20 Aug 2020 09:46:06 +0000 (+0300)
Subject: lib: file-dotlock - Do not call callback if we are going to timeout
X-Git-Tag: 2.3.13~191
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d50a5a115198347cb0dddd6d384051856ff128c2;p=thirdparty%2Fdovecot%2Fcore.git

lib: file-dotlock - Do not call callback if we are going to timeout
---

diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c
index b3e9d29b7f..ad14ef0ff0 100644
--- a/src/lib/file-dotlock.c
+++ b/src/lib/file-dotlock.c
@@ -539,7 +539,8 @@ dotlock_create(struct dotlock *dotlock, enum dotlock_create_flags flags,
 			}
 		}
 
-		if (last_notify != now && set->callback != NULL) {
+		if (last_notify != now && set->callback != NULL &&
+		    now < max_wait_time) {
 			last_notify = now;
 			change_secs = now - lock_info.last_change;
 			wait_left = max_wait_time - now;