- #43233, sasl support for ldap on windows

diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32
index 08ba64c38b4f224cecfd631d0325bbcf50a56b01..2fa05f438347b1d4eeecfc51898696b2e7c2ed3d 100644 (file)
--- a/ext/ldap/config.w32
+++ b/ext/ldap/config.w32
@@ -11,13 +11,17 @@ if (PHP_LDAP != "no") {
                        CHECK_LIB("ssleay32.lib", "ldap", PHP_LDAP) &&
                        CHECK_LIB("libeay32.lib", "ldap", PHP_LDAP) &&
                        CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) &&
-                       CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)) {
+                       CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)&&
+                       CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) {
                EXTENSION('ldap', 'ldap.c');
 
                AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1);
                AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1);
                AC_DEFINE('HAVE_LDAP_START_TLS_S', 1);
                AC_DEFINE('HAVE_LDAP', 1);
+               AC_DEFINE('HAVE_LDAP_SASL', 1);
+               AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1);
+               AC_DEFINE('LDAP_DEPRECATED', 1);
 
        } else {
                WARNING("ldap not enabled; libraries and headers not found");

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 61a94ad4d51db75ece53c98420a43542b7664492..9fe3b97ac31b555d7b50833b922eed84cca597c9 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -46,6 +46,7 @@
 
 #ifdef PHP_WIN32
 #include <string.h>
+#include "config.w32.h"
 #if HAVE_NSLDAP
 #include <winsock2.h>
 #endif

diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index b6cb4e048ef5a43546d6c16ec6362dd4e77cbf3c..5a0ceae40f1c0c0c66e58a498a74800e709722ff 100644 (file)
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -26,6 +26,7 @@
 #ifndef HAVE_ORALDAP
 #include <lber.h>
 #endif
+
 #include <ldap.h>
 
 extern zend_module_entry ldap_module_entry;