From: Howard Chu <hyc@openldap.org>
Date: Mon, 25 Apr 2022 16:26:37 +0000 (+0100)
Subject: Revert "ITS#9828 Fix ldap_count_values_len pointer confusion"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c197bbef9c889dc1a0c44458f6006be56ff4699;p=thirdparty%2Fopenldap.git

Revert "ITS#9828 Fix ldap_count_values_len pointer confusion"

This reverts commit 7e7fad5e03141b627e2d400ee4999cf629d34eb0.
---

diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index 4e3d6c2827..b3ac1907f8 100644
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -159,15 +159,7 @@ ldap_count_values( char **vals )
 int
 ldap_count_values_len( struct berval **vals )
 {
-	int i;
-
-	if ( vals == NULL )
-		return 0;
-
-	for ( i = 0; !BER_BVISNULL( vals[i] ); i++ )
-		; /* NULL */
-
-	return i;
+	return( ldap_count_values( (char **) vals ) );
 }
 
 void