X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=c3a6acc34d127809fe07deaf85632e8eca55f4d2;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=6213d10d8b755ef9ee9d2f1fc0f8f888f3878833;hpb=bc1cd9514938a3deb121c0b8afe5ee2c4dab5113;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 6213d10d8b..c3a6acc34d 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -166,6 +166,7 @@ do_search(
 	}
 	for ( i=0; i<siz; i++ ) {
 		an[i].an_desc = NULL;
+		an[i].an_oc = NULL;
 		slap_bv2ad(&an[i].an_name, &an[i].an_desc, &text);
 	}
 
@@ -282,13 +283,13 @@ do_search(
 	 * if we don't hold it.
 	 */
 	if ( (be = select_backend( &nbase, manageDSAit, 1 )) == NULL ) {
-		BVarray ref = referral_rewrite( default_referral,
+		BerVarray ref = referral_rewrite( default_referral,
 			NULL, &pbase, scope );
 
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
 			NULL, NULL, ref ? ref : default_referral, NULL );
 
-		bvarray_free( ref );
+		ber_bvarray_free( ref );
 		goto return_results;
 	}