From: Timo Sirainen <tss@iki.fi>
Date: Tue, 17 Mar 2015 15:30:33 +0000 (+0200)
Subject: auth ldap: Crashfixes for earlier changes.
X-Git-Tag: 2.2.17.rc1~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd58b6bbd3bf060beb34cb5b56ef8781b36f4f05;p=thirdparty%2Fdovecot%2Fcore.git

auth ldap: Crashfixes for earlier changes.
Hopefully works correctly now
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index f9f210b8c7..1476fa9612 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1222,7 +1222,7 @@ int db_ldap_connect(struct ldap_connection *conn)
 
 static void db_ldap_connect_callback(struct ldap_connection *conn)
 {
-	timeout_remove(&conn->to);
+	i_assert(conn->conn_state == LDAP_CONN_STATE_DISCONNECTED);
 	(void)db_ldap_connect(conn);
 }
 
@@ -1267,6 +1267,7 @@ static void db_ldap_conn_close(struct ldap_connection *conn)
 	unsigned int i;
 
 	conn->conn_state = LDAP_CONN_STATE_DISCONNECTED;
+	conn->delayed_connect = FALSE;
 	conn->default_bind_msgid = -1;
 
 	if (conn->to != NULL)