[dovecot-cvs] dovecot/src/auth db-ldap.c,1.46,1.47

[cras at dovecot.org]

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

Modified Files:
	db-ldap.c 
Log Message:
Prefer sasl/sasl.h. Require SASL v2, otherwise disable it.



Index: db-ldap.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- db-ldap.c	19 Jun 2006 16:10:16 -0000	1.46
+++ db-ldap.c	19 Jun 2006 16:14:47 -0000	1.47
@@ -16,13 +16,16 @@
 #include <stdlib.h>
 
 #define HAVE_LDAP_SASL
-#ifdef HAVE_SASL_H
-#  include <sasl.h>
-#elif defined (HAVE_SASL_SASL_H)
+#ifdef HAVE_SASL_SASL_H
 #  include <sasl/sasl.h>
+#elif defined (HAVE_SASL_H)
+#  include <sasl.h>
 #else
 #  undef HAVE_LDAP_SASL
 #endif
+#if SASL_VERSION_MAJOR < 2
+#  undef HAVE_LDAP_SASL
+#endif
 
 /* Older versions may require calling ldap_result() twice */
 #if LDAP_VENDOR_VERSION <= 20112