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

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 196e82c304..c3a6acc34d 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -30,7 +30,6 @@ do_search(
     Connection	*conn,	/* where to send results */
     Operation	*op	/* info about the op to which we're responding */
 ) {
-	int		i;
 	ber_int_t	scope, deref, attrsonly;
 	ber_int_t	sizelimit, timelimit;
 	struct berval base = { 0, NULL };
@@ -38,7 +37,8 @@ do_search(
 	struct berval nbase = { 0, NULL };
 	struct berval	fstr = { 0, NULL };
 	Filter		*filter = NULL;
-	AttributeName	an, *al = NULL, *alast, *anew;
+	AttributeName	*an;
+	ber_len_t	siz, off, i;
 	Backend		*be;
 	int			rc;
 	const char	*text;
@@ -76,7 +76,7 @@ do_search(
 	 */
 
 	/* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */
-	if ( ber_scanf( op->o_ber, "{oiiiib" /*}*/,
+	if ( ber_scanf( op->o_ber, "{miiiib" /*}*/,
 		&base, &scope, &deref, &sizelimit,
 	    &timelimit, &attrsonly ) == LBER_ERROR )
 	{
@@ -129,9 +129,10 @@ do_search(
 		"do_search \"%s\" %d %d %d %d %d\n", base.bv_val, scope,
 		deref, sizelimit, timelimit, attrsonly ));
 #else
-	Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base.bv_val, scope, deref );
-	Debug( LDAP_DEBUG_ARGS, "    %d %d %d\n", sizelimit, timelimit,
-	    attrsonly);
+	Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d",
+		base.bv_val, scope, deref );
+	Debug( LDAP_DEBUG_ARGS, "    %d %d %d\n",
+		sizelimit, timelimit, attrsonly);
 #endif
 
 	/* filter - returns a "normalized" version */
@@ -154,32 +155,19 @@ do_search(
 	Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr.bv_val, 0, 0 );
 #endif
 
-
 	/* attributes */
-	if ( ber_scanf( op->o_ber, "{" /*}*/ ) == LBER_ERROR ) {
+	siz = sizeof(AttributeName);
+	off = 0;
+	if ( ber_scanf( op->o_ber, "{M}}", &an, &siz, off ) == LBER_ERROR ) {
 		send_ldap_disconnect( conn, op,
 			LDAP_PROTOCOL_ERROR, "decoding attrs error" );
 		rc = SLAPD_DISCONNECT;
 		goto return_results;
 	}
-	while ( ber_scanf( op->o_ber, "o", &an.an_name ) != LBER_ERROR) {
-		anew = ch_malloc(sizeof(AttributeName));
-		anew->an_next = NULL;
-		anew->an_name = an.an_name;
-		anew->an_desc = NULL;
-		slap_bv2ad( &anew->an_name, &anew->an_desc, &text );
-		if (!al) {
-			al = anew;
-		} else {
-			alast->an_next = anew;
-		}
-		alast = anew;
-	}
-	if ( ber_scanf( op->o_ber, /*{{*/ "}}" ) == LBER_ERROR ) {
-		send_ldap_disconnect( conn, op,
-			LDAP_PROTOCOL_ERROR, "decoding attrs error" );
-		rc = SLAPD_DISCONNECT;
-		goto return_results;
+	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);
 	}
 
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
@@ -192,9 +180,7 @@ do_search(
 #endif
 
 		goto return_results;
-	} 
-
-	rc = LDAP_SUCCESS;
+	}
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
@@ -203,16 +189,14 @@ do_search(
 	Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
 
-
-	if ( al != NULL ) {
-		for ( anew = al; anew; anew=anew->an_next ) {
+	if ( siz != 0 ) {
+		for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-				"do_search:	   %s", anew->an_name.bv_val ));
+				"do_search:	   %s", an[i].an_name.bv_val ));
 #else
-			Debug( LDAP_DEBUG_ARGS, " %s", anew->an_name.bv_val, 0, 0 );
+			Debug( LDAP_DEBUG_ARGS, " %s", an[i].an_name.bv_val, 0, 0 );
 #endif
-
 		}
 	}
 
@@ -231,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;
 			}
@@ -274,7 +258,7 @@ do_search(
 
 			if( rc == LDAP_COMPARE_TRUE ) {
 				send_search_entry( NULL, conn, op,
-					entry, al, attrsonly, NULL );
+					entry, an, attrsonly, NULL );
 			}
 			entry_free( entry );
 
@@ -299,13 +283,13 @@ do_search(
 	 * if we don't hold it.
 	 */
 	if ( (be = select_backend( &nbase, manageDSAit, 1 )) == NULL ) {
-		struct berval **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 );
 
-		ber_bvecfree( ref );
+		ber_bvarray_free( ref );
 		goto return_results;
 	}
 
@@ -330,24 +314,20 @@ do_search(
 	if ( be->be_search ) {
 		(*be->be_search)( be, conn, op, &pbase, &nbase,
 			scope, deref, sizelimit,
-		    timelimit, filter, fstr.bv_val, al, attrsonly );
+		    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:;
-	free( base.bv_val );
 	if( pbase.bv_val != NULL) free( pbase.bv_val );
 	if( nbase.bv_val != NULL) free( nbase.bv_val );
 
 	if( fstr.bv_val != NULL) free( fstr.bv_val );
 	if( filter != NULL) filter_free( filter );
-	for (; al; al=anew ) {
-		anew = al->an_next;
-		free(al->an_name.bv_val);
-		free(al);
-	}
+	free(an);
 
 	return rc;
 }