X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=fada8cb8cdec9f3bebfc1fe3831aade9efb4693a;hb=9ba829436e33d42f918f377a7b636869f7a9c371;hp=31e4e434e7bc2867cf579c8299ba2b13400f73e2;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 31e4e434e7..fada8cb8cd 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -37,17 +37,15 @@ do_search(
 	struct berval nbase = { 0, NULL };
 	struct berval	fstr = { 0, NULL };
 	Filter		*filter = NULL;
-	AttributeName	*an;
-	ber_len_t	siz, off;
+	AttributeName	*an = NULL;
+	ber_len_t	siz, off, i;
 	Backend		*be;
 	int			rc;
-	int			i;
 	const char	*text;
 	int			manageDSAit;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		"do_search: conn %d\n", conn->c_connid ));
+	LDAP_LOG( OPERATION, ENTRY, "do_search: conn %d\n", conn->c_connid, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
 #endif
@@ -77,7 +75,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 )
 	{
@@ -113,9 +111,9 @@ do_search(
 	rc = dnPrettyNormal( NULL, &base, &pbase, &nbase );
 	if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+		LDAP_LOG( OPERATION, ERR, 
 			"do_search: conn %d  invalid dn (%s)\n",
-			conn->c_connid, base.bv_val ));
+			conn->c_connid, base.bv_val, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"do_search: invalid dn (%s)\n", base.bv_val, 0, 0 );
@@ -126,9 +124,10 @@ do_search(
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		"do_search \"%s\" %d %d %d %d %d\n", base.bv_val, scope,
-		deref, sizelimit, timelimit, attrsonly ));
+	LDAP_LOG( OPERATION, ARGS, "SRCH \"%s\" %d %d",
+		base.bv_val, scope, deref );
+	LDAP_LOG( OPERATION, ARGS, "    %d %d %d\n",
+		sizelimit, timelimit, attrsonly);
 #else
 	Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d",
 		base.bv_val, scope, deref );
@@ -137,30 +136,32 @@ do_search(
 #endif
 
 	/* filter - returns a "normalized" version */
-	rc = get_filter( conn, op->o_ber, &filter, &fstr, &text );
+	rc = get_filter( conn, op->o_ber, &filter, &text );
 	if( rc != LDAP_SUCCESS ) {
 		if( rc == SLAPD_DISCONNECT ) {
 			send_ldap_disconnect( conn, op,
 				LDAP_PROTOCOL_ERROR, text );
 		} else {
-			send_ldap_result( conn, op, rc,
-				NULL, text, NULL, NULL );
+			send_ldap_result( conn, op, rc, 
+					NULL, text, NULL, NULL );
 		}
 		goto return_results;
 	}
+	filter2bv( filter, &fstr );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		"do_search: conn %d	filter: %s\n", conn->c_connid, fstr.bv_val ));
+	LDAP_LOG( OPERATION, ARGS, 
+		"do_search: conn %d	filter: %s\n", 
+		conn->c_connid, fstr.bv_len ? fstr.bv_val : "empty", 0 );
 #else
-	Debug( LDAP_DEBUG_ARGS, "    filter: %s\n", fstr.bv_val, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "    filter: %s\n",
+		fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
 #endif
 
-
 	/* attributes */
 	siz = sizeof(AttributeName);
 	off = 0;
-	if ( ber_scanf( op->o_ber, "{w}}", &an, &siz, off ) == LBER_ERROR ) {
+	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;
@@ -168,51 +169,48 @@ 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);
 	}
 
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+		LDAP_LOG( OPERATION, INFO, 
 			"do_search: conn %d  get_ctrls failed (%d)\n",
-			conn->c_connid, rc ));
+			conn->c_connid, rc, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
 #endif
 
 		goto return_results;
-	} 
-
-	rc = LDAP_SUCCESS;
+	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		"do_search: conn %d	attrs:", conn->c_connid ));
+	LDAP_LOG( OPERATION, ARGS, 
+		"do_search: conn %d	attrs:", conn->c_connid, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
 
-
 	if ( siz != 0 ) {
 		for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-				"do_search:	   %s", an[i].an_name.bv_val ));
+			LDAP_LOG( OPERATION, ARGS, 
+				"do_search: %s", an[i].an_name.bv_val, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ARGS, " %s", an[i].an_name.bv_val, 0, 0 );
 #endif
-
 		}
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, "\n" ));
+	LDAP_LOG( OPERATION, ARGS, "\n" , 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
 #endif
 
 	Statslog( LDAP_DEBUG_STATS,
-	    "conn=%ld op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
+	    "conn=%lu op=%lu SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
 	    op->o_connid, op->o_opid, pbase.bv_val, scope, fstr.bv_val );
 
 	manageDSAit = get_manageDSAit( op );
@@ -220,9 +218,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;
 			}
@@ -239,7 +237,7 @@ do_search(
 		}
 
 #if defined( SLAPD_SCHEMA_DN )
-		else if ( strcasecmp( nbase.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+		else if ( bvmatch( &nbase, &global_schemandn ) ) {
 			/* check restrictions */
 			rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
 			if( rc != LDAP_SUCCESS ) {
@@ -288,13 +286,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;
 	}
 
@@ -319,23 +317,20 @@ do_search(
 	if ( be->be_search ) {
 		(*be->be_search)( be, conn, op, &pbase, &nbase,
 			scope, deref, sizelimit,
-		    timelimit, filter, &fstr, an, 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 (i = 0; i<siz; i++ ) {
-		free(an[i].an_name.bv_val);
-	}
-	free(an);
+	if( an != NULL ) free( an );
 
 	return rc;
 }