From: Timo Sirainen <tss@iki.fi>
Date: Mon, 22 Jun 2009 05:44:42 +0000 (-0400)
Subject: login client idle timeout should be larger than auth request timeout, not vice versa.
X-Git-Tag: 2.0.alpha1~545
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c60c8c5a01371657d29e4e91bc5562a1a7c4758;p=thirdparty%2Fdovecot%2Fcore.git

login client idle timeout should be larger than auth request timeout, not vice versa.

--HG--
branch : HEAD
---

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index fbf4f860aa..1edd135f13 100644
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -40,8 +40,8 @@
    send a "waiting" message. */
 #define AUTH_WAITING_TIMEOUT_MSECS (30*1000)
 
-#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS >= AUTH_REQUEST_TIMEOUT*1000
-#  error client idle timeout must be smaller than authentication timeout
+#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS < AUTH_REQUEST_TIMEOUT*1000
+#  error client idle timeout must be larger than authentication timeout
 #endif
 
 #define AUTH_SERVER_WAITING_MSG \
diff --git a/src/lib-auth/auth-client-interface.h b/src/lib-auth/auth-client-interface.h
index b7b0e0db16..fe1fa42d74 100644
--- a/src/lib-auth/auth-client-interface.h
+++ b/src/lib-auth/auth-client-interface.h
@@ -7,8 +7,8 @@
 #define AUTH_CLIENT_PROTOCOL_MINOR_VERSION 0
 
 #define AUTH_CLIENT_MAX_LINE_LENGTH 8192
-/* Use a bit larger than login process timeout */
-#define AUTH_REQUEST_TIMEOUT (3*60 + 30)
+/* Use a bit smaller than login process timeout */
+#define AUTH_REQUEST_TIMEOUT (3*60 - 30)
 
 enum mech_security_flags {
 	/* Don't advertise this as available SASL mechanism (eg. APOP) */
diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c
index 7db499ace9..30e26ca39e 100644
--- a/src/pop3-login/client.c
+++ b/src/pop3-login/client.c
@@ -31,8 +31,8 @@
    clients, it's faster if we disconnect multiple clients. */
 #define CLIENT_DESTROY_OLDEST_COUNT 16
 
-#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS >= AUTH_REQUEST_TIMEOUT*1000
-#  error client idle timeout must be smaller than authentication timeout
+#if CLIENT_LOGIN_IDLE_TIMEOUT_MSECS < AUTH_REQUEST_TIMEOUT*1000
+#  error client idle timeout must be larger than authentication timeout
 #endif
 
 const char *login_protocol = "pop3";