Don't instantiate SLAPI overlay in tool mode

diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index b0306abd9462090e31fa6e5a3b0115be531e0af5..823b6328f60360f3c0216dfde35e32b127b2f665 100644 (file)
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -643,6 +643,12 @@ slapi_int_read_config(
                return 1;
        }
 
+       if ( slapMode & SLAP_TOOL_MODE ) {
+               /* No SLAPI plugins for tools, yet... */
+               /* When we have DB overlays we will support DB plugins */
+               return 0;
+       }
+
        /* automatically instantiate overlay if necessary */
        if ( !overlay_is_inst( be, SLAPI_OVERLAY_NAME ) ) {
                if ( overlay_config( be, SLAPI_OVERLAY_NAME ) != 0 ) {