changeset 9155:1c91fa0d804b HEAD

login client idle timeout should be larger than auth request timeout, not vice versa.
author Timo Sirainen <tss@iki.fi>
date Mon, 22 Jun 2009 01:43:31 -0400
parents 8206c38856ff
children 069d1d3f1760
files src/auth/auth-client-interface.h src/imap-login/client.c src/pop3-login/client.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-client-interface.h	Mon Jun 22 00:42:56 2009 -0400
+++ b/src/auth/auth-client-interface.h	Mon Jun 22 01:43:31 2009 -0400
@@ -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) */
--- a/src/imap-login/client.c	Mon Jun 22 00:42:56 2009 -0400
+++ b/src/imap-login/client.c	Mon Jun 22 01:43:31 2009 -0400
@@ -38,8 +38,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_WAITING_MSG \
--- a/src/pop3-login/client.c	Mon Jun 22 00:42:56 2009 -0400
+++ b/src/pop3-login/client.c	Mon Jun 22 01:43:31 2009 -0400
@@ -29,8 +29,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";