sniper Tue Jan 18 19:27:42 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/ldap ldap.c
Log:
MFH: Force ldapv3 for ldap_start_tls()
http://cvs.php.net/diff.php/php-src/ext/ldap/ldap.c?r1=1.154.2.1&r2=1.154.2.2&ty=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.154.2.1 php-src/ext/ldap/ldap.c:1.154.2.2
--- php-src/ext/ldap/ldap.c:1.154.2.1 Wed Jan 5 05:24:40 2005
+++ php-src/ext/ldap/ldap.c Tue Jan 18 19:27:42 2005
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.154.2.1 2005/01/05 10:24:40 hyanantha Exp $ */
+/* $Id: ldap.c,v 1.154.2.2 2005/01/19 00:27:42 sniper Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -303,7 +303,7 @@
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,v 1.154.2.1
2005/01/05 10:24:40 hyanantha Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.154.2.2
2005/01/19 00:27:42 sniper Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -2017,7 +2017,7 @@
{
zval **link;
ldap_linkdata *ld;
- int rc;
+ int rc, protocol = LDAP_VERSION3;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &link) ==
FAILURE) {
WRONG_PARAM_COUNT;
@@ -2025,7 +2025,9 @@
ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link",
le_link);
- if ((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS) {
+ if (((rc = ldap_set_option(ld->link, LDAP_OPT_PROTOCOL_VERSION,
&protocol)) != LDAP_SUCCESS) ||
+ ((rc = ldap_start_tls_s(ld->link, NULL, NULL)) != LDAP_SUCCESS)
+ ) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Unable to start
TLS: %s", ldap_err2string(rc));
RETURN_FALSE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
