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 fbf4f860aaf60d39937297074dd516c37a4fbbde..1edd135f13e614849341eebff9453a1f2815c022 100644 (file)
--- 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 b7b0e0db16912df59ecbae4320ac1b00009b599b..fe1fa42d74c44c2a7ad418adad5ccd21bb7b6fca 100644 (file)
--- 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 7db499ace9ec15096bbf4ceafa7d446708a57638..30e26ca39efb068e9f9d3acfdebaf8be5d729df0 100644 (file)
--- 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";