cvs: php-src /ext/ldap ldap.c
| From: | Jani Taskinen | Date: | Wed, 19 Jan 2005 00:27:21 +0000 |
| Subject: | cvs: php-src /ext/ldap ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29982@lists.php.net to get a copy of this message | ||
sniper Tue Jan 18 19:27:21 2005 EDT
Modified files:
/php-src/ext/ldap ldap.c
Log:
- ldap_start_tls() requires ldapv3 protocol -> force it
http://cvs.php.net/diff.php/php-src/ext/ldap/ldap.c?r1=1.154&r2=1.155&ty=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.154 php-src/ext/ldap/ldap.c:1.155
--- php-src/ext/ldap/ldap.c:1.154 Mon Jun 28 18:31:28 2004
+++ php-src/ext/ldap/ldap.c Tue Jan 18 19:27:21 2005
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.154 2004/06/28 22:31:28 iliaa Exp $ */
+/* $Id: ldap.c,v 1.155 2005/01/19 00:27:21 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 2004/06/28 22:31:28
iliaa Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.155 2005/01/19 00:27:21
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 {