pajoye Mon, 17 May 2010 20:09:42 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299434
Log: - #43233, sasl support for ldap on windows Bug: http://bugs.php.net/43233 (Assigned) SASL options do not load - Missing SASL support in windows builds Changed paths: U php/php-src/branches/PHP_5_3/ext/ldap/config.w32 U php/php-src/branches/PHP_5_3/ext/ldap/ldap.c U php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h U php/php-src/trunk/ext/ldap/config.w32 U php/php-src/trunk/ext/ldap/ldap.c U php/php-src/trunk/ext/ldap/php_ldap.h Modified: php/php-src/branches/PHP_5_3/ext/ldap/config.w32 =================================================================== --- php/php-src/branches/PHP_5_3/ext/ldap/config.w32 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/branches/PHP_5_3/ext/ldap/config.w32 2010-05-17 20:09:42 UTC (rev 299434) @@ -11,13 +11,17 @@ 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"); Modified: php/php-src/branches/PHP_5_3/ext/ldap/ldap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/ldap/ldap.c 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/branches/PHP_5_3/ext/ldap/ldap.c 2010-05-17 20:09:42 UTC (rev 299434) @@ -46,6 +46,7 @@ #ifdef PHP_WIN32 #include <string.h> +#include "config.w32.h" #if HAVE_NSLDAP #include <winsock2.h> #endif Modified: php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/branches/PHP_5_3/ext/ldap/php_ldap.h 2010-05-17 20:09:42 UTC (rev 299434) @@ -26,6 +26,7 @@ #ifndef HAVE_ORALDAP #include <lber.h> #endif + #include <ldap.h> extern zend_module_entry ldap_module_entry; Modified: php/php-src/trunk/ext/ldap/config.w32 =================================================================== --- php/php-src/trunk/ext/ldap/config.w32 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/trunk/ext/ldap/config.w32 2010-05-17 20:09:42 UTC (rev 299434) @@ -11,13 +11,17 @@ 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"); Modified: php/php-src/trunk/ext/ldap/ldap.c =================================================================== --- php/php-src/trunk/ext/ldap/ldap.c 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/trunk/ext/ldap/ldap.c 2010-05-17 20:09:42 UTC (rev 299434) @@ -46,6 +46,7 @@ #ifdef PHP_WIN32 #include <string.h> +#include "config.w32.h" #if HAVE_NSLDAP #include <winsock2.h> #endif Modified: php/php-src/trunk/ext/ldap/php_ldap.h =================================================================== --- php/php-src/trunk/ext/ldap/php_ldap.h 2010-05-17 18:56:43 UTC (rev 299433) +++ php/php-src/trunk/ext/ldap/php_ldap.h 2010-05-17 20:09:42 UTC (rev 299434) @@ -26,6 +26,7 @@ #ifndef HAVE_ORALDAP #include <lber.h> #endif + #include <ldap.h> extern zend_module_entry ldap_module_entry;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
