Fix error handling in ldap_get_field_from_username

dregad · dregad · commit 408078641c0c · 2011-09-20T12:04:19.000+02:00
When successful, ldap_get_entries always returns an array with at least
one element inside (the count), so the check for no matches was always
successful even when no values were retrieved from LDAP.

Fixes #13331
diff --git a/core/ldap_api.php b/core/ldap_api.php
@@ -241,7 +241,7 @@ function ldap_get_field_from_username( $p_username, $p_field ) {
 	ldap_unbind( $t_ds );
 
 	# If no matches, return null.
-	if ( count( $t_info ) == 0 ) {
+	if ( $t_info['count'] == 0 ) {
 		log_event( LOG_LDAP, "No matches found." );
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ function ldap_get_field_from_username( $p_username, $p_field ) {`
`241`	`241`	`ldap_unbind( $t_ds );`
`242`	`242`
`243`	`243`	`# If no matches, return null.`
`244`		`- if ( count( $t_info ) == 0 ) {`
	`244`	`+ if ( $t_info['count'] == 0 ) {`
`245`	`245`	`log_event( LOG_LDAP, "No matches found." );`
`246`	`246`	`return null;`
`247`	`247`	`}`