cvs: /php4 ChangeLog /php4/ext/ldap ldap.c

zeev Sat Aug 7 12:32:51 1999 EDT Modified files: /php4 ChangeLog /php4/ext/ldap ldap.c Log: Fix for bug #1980 Index: php4/ChangeLog diff -u php4/ChangeLog:1.40 php4/ChangeLog:1.41 --- php4/ChangeLog:1.40 Sat Aug 7 12:02:48 1999 +++ php4/ChangeLog Sat Aug 7 12:32:50 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Fixed ldap_search(), ldap_read() and ldap_list() (Zeev) - Fixed Apache information in phpinfo() (sam@breakfree.com) - Improved register_shutdown_function() - you may now supply arguments that will be passed to the shutdown function (Zeev) Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.11 php4/ext/ldap/ldap.c:1.12 --- php4/ext/ldap/ldap.c:1.11 Mon Aug 2 15:16:43 1999 +++ php4/ext/ldap/ldap.c Sat Aug 7 12:32:50 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.11 1999/08/02 19:16:43 zeev Exp $ */ +/* $Id: ldap.c,v 1.12 1999/08/07 16:32:50 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.11 1999/08/02 19:16:43 zeev Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.12 1999/08/07 16:32:50 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -537,7 +537,7 @@ static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) { - pval *link, *base_dn, *filter, *attrs, *attr; + pval *link, *base_dn, *filter, *attrs, **attr; char *ldap_base_dn, *ldap_filter; LDAP *ldap; char **ldap_attrs = NULL; @@ -589,8 +589,9 @@ RETURN_FALSE; return; } - convert_to_string(attr); - ldap_attrs[i] = attr->value.str.val; + SEPARATE_ZVAL(attr); + convert_to_string(*attr); + ldap_attrs[i] = (*attr)->value.str.val; } ldap_attrs[num_attribs] = NULL;