[dovecot-cvs] dovecot/src/auth db-ldap.c,1.41.2.9,1.41.2.10

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv24164

Modified Files:
      Tag: branch_1_0
	db-ldap.c 
Log Message:
Cleanup



Index: db-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.41.2.9
retrieving revision 1.41.2.10
diff -u -d -r1.41.2.9 -r1.41.2.10
--- db-ldap.c	4 Nov 2006 15:09:25 -0000	1.41.2.9
+++ db-ldap.c	4 Nov 2006 15:51:28 -0000	1.41.2.10
@@ -451,7 +451,6 @@
 #endif
 	}
 
-	/* FIXME: we shouldn't use blocking bind */
 	if (conn->set.sasl_bind) {
 #ifdef HAVE_LDAP_SASL
 		struct ldap_sasl_bind_context context;
@@ -462,16 +461,18 @@
 		context.realm = conn->set.sasl_realm;
 		context.authzid = conn->set.sasl_authz_id;
 
+		/* There doesn't seem to be a way to do SASL binding
+		   asynchronously.. */
 		ret = ldap_sasl_interactive_bind_s(conn->ld, NULL,
 						   conn->set.sasl_mech,
 						   NULL, NULL, LDAP_SASL_QUIET,
 						   sasl_interact, &context);
-#else
-		i_fatal("LDAP: sasl_bind=yes but no SASL support compiled in");
-#endif
 		if (db_ldap_connect_finish(conn, ret) < 0)
 			return -1;
 		db_ldap_get_fd(conn);
+#else
+		i_fatal("LDAP: sasl_bind=yes but no SASL support compiled in");
+#endif
 	} else {
 		if (db_ldap_bind(conn) < 0)
 			return -1;