cvs: php4(PHP_4_0_7) /ext/ldap ldap.c
| From: | Stig Venaas | Date: | Sat, 01 Dec 2001 14:17:43 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /ext/ldap ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8346@lists.php.net to get a copy of this message | ||
venaas Sat Dec 1 09:17:43 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/ext/ldap ldap.c
Log:
Fixing ldap_first/next_attribute()
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.94.2.2 php4/ext/ldap/ldap.c:1.94.2.3
--- php4/ext/ldap/ldap.c:1.94.2.2 Thu Oct 11 19:51:37 2001
+++ php4/ext/ldap/ldap.c Sat Dec 1 09:17:43 2001
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.94.2.2 2001/10/11 23:51:37 ssb Exp $ */
+/* $Id: ldap.c,v 1.94.2.3 2001/12/01 14:17:43 venaas Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -210,6 +210,7 @@
le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result",
module_number);
le_link = zend_register_list_destructors_ex(_close_ldap_link, NULL, "ldap link",
module_number);
le_result_entry = zend_register_list_destructors_ex(NULL, NULL, "ldap result entry",
module_number);
+ le_ber_entry = zend_register_list_destructors_ex(NULL, NULL, "ldap ber entry",
module_number);
ldap_module_entry.type = type;
@@ -253,7 +254,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.94.2.2 2001/10/11
23:51:37 ssb Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.94.2.3 2001/12/01
14:17:43 venaas Exp $" );
php_info_print_table_row(2, "Total Links", maxl );
#ifdef LDAP_API_VERSION
@@ -990,7 +991,7 @@
if ((attribute = ldap_first_attribute(ldap, ldap_result_entry, &ber)) == NULL) {
RETURN_FALSE;
} else {
- ZEND_REGISTER_RESOURCE(return_value, ber, le_ber_entry);
+ ZEND_REGISTER_RESOURCE(*berp, ber, le_ber_entry);
RETVAL_STRING(attribute, 1);
#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS
@@ -1021,7 +1022,7 @@
if ((attribute = ldap_next_attribute(ldap, ldap_result_entry, ber)) == NULL) {
RETURN_FALSE;
} else {
- ZEND_REGISTER_RESOURCE(return_value, ber, le_ber_entry);
+ ZEND_REGISTER_RESOURCE(*berp, ber, le_ber_entry);
RETVAL_STRING(attribute, 1);
#if ( LDAP_API_VERSION > 2000 ) || HAVE_NSLDAP || WINDOWS