From: Timo Sirainen <tss@iki.fi>
Date: Thu, 13 Nov 2003 16:05:36 +0000 (+0200)
Subject: Always give error if flock is used with a system where it's not supported.
X-Git-Tag: 1.1.alpha1~4220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a853c0cf7f52437d8488f02fadaba94385fcf5b;p=thirdparty%2Fdovecot%2Fcore.git

Always give error if flock is used with a system where it's not supported.
The check was actually checking fcntl before..

--HG--
branch : HEAD
---

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index cdbb79e4fb..f0b0f2045a 100644
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -487,9 +487,8 @@ static int settings_verify(struct settings *set)
 	}
 
 #ifndef HAVE_FLOCK
-	if (fcntl_got && !dotlock_got && !flock_got) {
-		i_error("mbox_locks: Only flock selected, "
-			"and flock() isn't supported in this system");
+	if (flock_got) {
+		i_error("mbox_locks: flock is not supported in this system");
 		return FALSE;
 	}
 	flock_got = FALSE;