# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1251207011 14400
# Node ID 355d5a40f7a7220e9df668beaa1a10683cbbc803
# Parent  e1685886c795e7830790f55b73dfa7e09b8f122f
ldap: Don't log an error when server disconnects us because of idling.

diff -r e1685886c795 -r 355d5a40f7a7 src/auth/db-ldap.c
--- a/src/auth/db-ldap.c	Tue Aug 25 09:08:11 2009 -0400
+++ b/src/auth/db-ldap.c	Tue Aug 25 09:30:11 2009 -0400
@@ -575,6 +575,7 @@
 {
 	struct timeval timeout;
 	LDAPMessage *res;
+	time_t prev_reply_diff;
 	int ret;
 
 	for (;;) {
@@ -596,6 +597,7 @@
 		db_ldap_handle_result(conn, res);
 		ldap_msgfree(res);
 	}
+	prev_reply_diff = ioloop_time - conn->last_reply_stamp;
 	conn->last_reply_stamp = ioloop_time;
 
 	if (ret == 0) {
@@ -606,8 +608,7 @@
 		i_error("LDAP: ldap_result() failed: %s", ldap_get_error(conn));
 		ldap_conn_reconnect(conn);
 	} else if (aqueue_count(conn->request_queue) > 0 ||
-		   ioloop_time - conn->last_reply_stamp <
-		   				DB_LDAP_IDLE_RECONNECT_SECS) {
+		   prev_reply_diff < DB_LDAP_IDLE_RECONNECT_SECS) {
 		i_error("LDAP: Connection lost to LDAP server, reconnecting");
 		ldap_conn_reconnect(conn);
 	} else {