From 57cfa703bffa174ee18de0cd1e14b0ed213e6aa9 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 17 May 2010 20:09:42 +0000 Subject: [PATCH] - #43233, sasl support for ldap on windows --- ext/ldap/config.w32 | 6 +++++- ext/ldap/ldap.c | 1 + ext/ldap/php_ldap.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 08ba64c38b..2fa05f4383 100644 --- 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 61a94ad4d5..9fe3b97ac3 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -46,6 +46,7 @@ #ifdef PHP_WIN32 #include +#include "config.w32.h" #if HAVE_NSLDAP #include #endif diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h index b6cb4e048e..5a0ceae40f 100644 --- a/ext/ldap/php_ldap.h +++ b/ext/ldap/php_ldap.h @@ -26,6 +26,7 @@ #ifndef HAVE_ORALDAP #include #endif + #include extern zend_module_entry ldap_module_entry; -- 2.40.0