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