Install object type plugins

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 2314bce085fe28f58470a7bed40480c46e11331c..481af2ce287e9b516bd686adecd226a55b8cd5c8 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -488,10 +488,10 @@ static int doPreSearchPluginFNs( Backend *be, Slapi_PBlock *pb )
                 * entire operation.
                 */
 #ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, INFO, "do_search: search preoperation plugin "
+               LDAP_LOG( OPERATION, INFO, "doPreSearchPluginFNs: search preoperation plugin "
                                "failed\n", 0, 0, 0 );
 #else
-               Debug(LDAP_DEBUG_TRACE, "do_search: search preoperation plugin "
+               Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin "
                                "failed.\n", 0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
@@ -515,7 +515,7 @@ static int doSearchRewriteFNs( Backend *be, Slapi_PBlock *pb, Filter **filter, s
                filter2bv( *filter, fstr );
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ARGS, 
-                       "do_search: after compute_rewrite_search filter: %s\n", 
+                       "doSearchRewriteFNs: 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",
@@ -530,10 +530,10 @@ static int doPostSearchPluginFNs( Backend *be, Slapi_PBlock *pb )
 {
        if ( doPluginFNs( be, SLAPI_PLUGIN_POST_SEARCH_FN, pb ) != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, INFO, "do_search: search postoperation plugins "
+               LDAP_LOG( OPERATION, INFO, "doPostSearchPluginFNs: search postoperation plugins "
                                "failed\n", 0, 0, 0 );
 #else
-               Debug(LDAP_DEBUG_TRACE, "do_search: search postoperation plugins "
+               Debug(LDAP_DEBUG_TRACE, "doPostSearchPluginFNs: search postoperation plugins "
                                "failed.\n", 0, 0, 0);
 #endif
        }

diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index 5acd5261eb2c00e09680f5d91cd1a6a0249fece6..46f3979ce34ebfa8b4614efc653aee07639a304c 100644 (file)
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -673,7 +673,8 @@ netscape_plugin(
 
        if ( iType == SLAPI_PLUGIN_PREOPERATION ||
                        iType == SLAPI_PLUGIN_EXTENDEDOP ||
-                       iType == SLAPI_PLUGIN_POSTOPERATION ) {
+                       iType == SLAPI_PLUGIN_POSTOPERATION ||
+                       iType == SLAPI_PLUGIN_OBJECT ) {
                int rc;
                Slapi_PBlock *pPlugin;