diff options
| author | Pierre Joye <pajoye@php.net> | 2010-05-17 20:09:42 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-05-17 20:09:42 +0000 |
| commit | 57cfa703bffa174ee18de0cd1e14b0ed213e6aa9 (patch) | |
| tree | 3c5e73555ecac8a249c379b5c51731c4f68049fd /ext/ldap | |
| parent | df59ed1c11fc8dcfd30c4681a89228d334627475 (diff) | |
| download | php-git-57cfa703bffa174ee18de0cd1e14b0ed213e6aa9.tar.gz | |
- #43233, sasl support for ldap on windows
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/config.w32 | 6 | ||||
| -rw-r--r-- | ext/ldap/ldap.c | 1 | ||||
| -rw-r--r-- | ext/ldap/php_ldap.h | 1 |
3 files changed, 7 insertions, 1 deletions
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 <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 b6cb4e048e..5a0ceae40f 100644 --- 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; |