X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=c3a6acc34d127809fe07deaf85632e8eca55f4d2;hb=e25f6ef0cdd1780577dffeaca8ba8b19b5697880;hp=75795eaabf8c8677e2dff0fd631c37459ba03a0c;hpb=ec46a2f33a602c5603f1cf6415b183f6ff0939d5;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 75795eaabf..c3a6acc34d 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -155,7 +155,6 @@ do_search(
 	Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr.bv_val, 0, 0 );
 #endif
 
-
 	/* attributes */
 	siz = sizeof(AttributeName);
 	off = 0;
@@ -167,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);
 	}
 
@@ -180,9 +180,7 @@ do_search(
 #endif
 
 		goto return_results;
-	} 
-
-	rc = LDAP_SUCCESS;
+	}
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
@@ -191,7 +189,6 @@ do_search(
 	Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
 
-
 	if ( siz != 0 ) {
 		for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
@@ -218,9 +215,9 @@ do_search(
 	if ( scope == LDAP_SCOPE_BASE ) {
 		Entry *entry = NULL;
 
-		if ( strcasecmp( nbase.bv_val, LDAP_ROOT_DSE ) == 0 ) {
+		if ( nbase.bv_len == 0 ) {
 #ifdef LDAP_CONNECTIONLESS
-			/* Ignore LDAPv2 CLDAP DSE queries */
+			/* Ignore LDAPv2 CLDAP Root DSE queries */
 			if (op->o_protocol==LDAP_VERSION2 && conn->c_is_udp) {
 				goto return_results;
 			}
@@ -286,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;
 	}
 
@@ -320,7 +317,8 @@ do_search(
 		    timelimit, filter, &fstr, an, attrsonly );
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "operation not supported within namingContext", NULL, NULL );
+			NULL, "operation not supported within namingContext",
+			NULL, NULL );
 	}
 
 return_results:;