Call search rewriter callback before first preop search plugin

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c4c5fb01aaf9a54363e06c46a9c65c8e61b3554a..fdd53ded16e98761ce37dfdd3615ad59a3230970 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -353,6 +353,14 @@ do_search(
        slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)attrsonly );
        slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
 
+       /*
+        * XXX FIXME: do we call this here? Awaiting clarification
+        * from Sun.
+        *
+        * Rewrite filter for any computed attributes.
+        */
+       doPluginFNs( be, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, pb );
+
        rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_SEARCH_FN, pb );
        if ( rc != 0 ) {
                /*