diff options
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/config.w32 | 8 | ||||
| -rw-r--r-- | ext/ldap/ldap.c | 5 | ||||
| -rw-r--r-- | ext/ldap/php_ldap.h | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index f521fe574..42d285fd4 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -1,4 +1,4 @@ -// $Id: config.w32 263930 2008-07-31 18:04:49Z pajoye $ +// $Id: config.w32 299434 2010-05-17 20:09:42Z pajoye $ // vim:ft=javascript ARG_WITH("ldap", "LDAP support", "no"); @@ -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 c13912496..c436bb4ad 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: ldap.c 299434 2010-05-17 20:09:42Z pajoye $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -46,6 +46,7 @@ #ifdef PHP_WIN32 #include <string.h> +#include "config.w32.h" #if HAVE_NSLDAP #include <winsock2.h> #endif @@ -225,7 +226,7 @@ PHP_MINFO_FUNCTION(ldap) php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c 293036 2010-01-03 09:23:27Z sebastian $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c 299434 2010-05-17 20:09:42Z pajoye $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h index fc4e3e8f2..c6cab4eaf 100644 --- a/ext/ldap/php_ldap.h +++ b/ext/ldap/php_ldap.h @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ldap.h 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: php_ldap.h 299434 2010-05-17 20:09:42Z pajoye $ */ #ifndef PHP_LDAP_H #define PHP_LDAP_H @@ -26,6 +26,7 @@ #ifndef HAVE_ORALDAP #include <lber.h> #endif + #include <ldap.h> extern zend_module_entry ldap_module_entry; |