[dovecot-cvs] dovecot/src/auth db-ldap.c,1.50,1.51
tss at dovecot.org
tss at dovecot.org
Sat Nov 4 15:51:32 UTC 2006
Update of /var/lib/cvs/dovecot/src/auth
In directory talvi:/tmp/cvs-serv24160
Modified Files:
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.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- db-ldap.c 4 Nov 2006 15:09:26 -0000 1.50
+++ db-ldap.c 4 Nov 2006 15:51:30 -0000 1.51
@@ -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;
More information about the dovecot-cvs
mailing list