dovecot-2.2: auth ldap: Crashfixes for earlier changes.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3546457ae3fb
changeset: 18364:3546457ae3fb
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 17 17:30:33 2015 +0200
description:
auth ldap: Crashfixes for earlier changes.
Hopefully works correctly now

diffstat:

 src/auth/db-ldap.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r a4acf88b0c91 -r 3546457ae3fb src/auth/db-ldap.c
--- a/src/auth/db-ldap.c	Tue Mar 17 10:49:20 2015 +0200
+++ b/src/auth/db-ldap.c	Tue Mar 17 17:30:33 2015 +0200
@@ -1222,7 +1222,7 @@
 
 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 @@
 	unsigned int i;
 
 	conn->conn_state = LDAP_CONN_STATE_DISCONNECTED;
+	conn->delayed_connect = FALSE;
 	conn->default_bind_msgid = -1;
 
 	if (conn->to != NULL)