From 12af6de4cf4327c1883071a536296e0c62810666 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 22 Jan 2003 15:46:45 +0000 Subject: [PATCH] Clarification regarding compute search filter rewriting: only SLAPI_SEARCH_FILTER needs to be updated --- servers/slapd/search.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 06d6167965..664d7963de 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -372,8 +372,21 @@ do_search( } if ( doPluginFNs( be, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, pb ) == 0 ) { + /* + * The plugin can set the SLAPI_SEARCH_FILTER. + * SLAPI_SEARCH_STRFILER is not normative. + */ slapi_pblock_get( pb, SLAPI_SEARCH_FILTER, (void *)&filter); - slapi_pblock_get( pb, SLAPI_SEARCH_STRFILTER, (void *)&fstr.bv_val ); + ch_free( fstr.bv_val ); + filter2bv( filter, &fstr ); +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, ARGS, + "do_search: after compute_rewrite_search filter: %s\n", + fstr.bv_len ? fstr.bv_val : "empty", 0 ); +#else + Debug( LDAP_DEBUG_ARGS, " after compute_rewrite_search filter: %s\n", + fstr.bv_len ? fstr.bv_val : "empty", 0, 0 ); +#endif } #endif /* defined( LDAP_SLAPI ) */ -- 2.39.5