cvs: /php3/functions ldap.c

venaas Sun Nov 28 08:52:20 1999 EDT Modified files: /php3/functions ldap.c Log: removed code from ldap_get_entries() that counted number of attributes for each entry and returned false if one entry had none Index: php3/functions/ldap.c diff -u php3/functions/ldap.c:1.74 php3/functions/ldap.c:1.75 --- php3/functions/ldap.c:1.74 Tue Nov 16 09:24:38 1999 +++ php3/functions/ldap.c Sun Nov 28 08:52:20 1999 @@ -30,7 +30,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.74 1999/11/16 14:24:38 kk Exp $ */ +/* $Id: ldap.c,v 1.75 1999/11/28 13:52:20 venaas Exp $ */ #define IS_EXT_MODULE #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE @@ -318,7 +318,7 @@ php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.74 1999/11/16 14:24:38 kk Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.75 1999/11/28 13:52:20 venaas 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>" @@ -893,7 +893,7 @@ LDAPMessage *ldap_result, *ldap_result_entry; pval tmp1, tmp2; LDAP *ldap; -int num_entries, num_attrib, num_values, i; +int num_entries, num_values, i; int attr_count, entry_count; BerElement *ber; char *attribute; @@ -924,14 +924,6 @@ while(ldap_result_entry != NULL) { - num_attrib = 0; - attribute = ldap_first_attribute(ldap, ldap_result_entry, &ber); - if (attribute == NULL) RETURN_FALSE; - while (attribute != NULL) { - num_attrib++; - attribute = ldap_next_attribute(ldap, ldap_result_entry, ber); - } - array_init(&tmp1); attr_count = 0; @@ -954,7 +946,7 @@ attribute = ldap_next_attribute(ldap, ldap_result_entry, ber); } - add_assoc_long(&tmp1, "count", num_attrib); + add_assoc_long(&tmp1, "count", attr_count); dn = ldap_get_dn(ldap, ldap_result_entry); add_assoc_string(&tmp1, "dn", dn, 1);