ITS#4337 insert EntryInfo in proper slot

[openldap] / servers / slapd / slapi / plugin.c

diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index 823b6328f60360f3c0216dfde35e32b127b2f665..22e482328a414782d9a6e21e35c9adc5ed2c99bf 100644 (file)
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2002-2005 The OpenLDAP Foundation.
+ * Copyright 2002-2006 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002-2003 IBM Corporation.
  * All rights reserved.
  *
@@ -643,15 +643,9 @@ 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 ) {
+       if ( !slapi_over_is_inst( be ) ) {
+               if ( slapi_over_config( be ) != 0 ) {
                        fprintf( stderr, "Failed to instantiate SLAPI overlay\n");
                        return -1;
                }
@@ -744,29 +738,3 @@ slapi_int_plugin_unparse(
        }
 }
 
-int
-slapi_int_initialize(void)
-{
-       if ( ldap_pvt_thread_mutex_init( &slapi_hn_mutex ) ) {
-               return -1;
-       }
-       
-       if ( ldap_pvt_thread_mutex_init( &slapi_time_mutex ) ) {
-               return -1;
-       }
-
-       if ( ldap_pvt_thread_mutex_init( &slapi_printmessage_mutex ) ) {
-               return -1;
-       }
-
-       slapi_log_file = slapi_ch_strdup( LDAP_RUNDIR LDAP_DIRSEP "errors" );
-       if ( slapi_log_file == NULL ) {
-               return -1;
-       }
-
-       if ( slapi_int_init_object_extensions() != 0 ) {
-               return -1;
-       }
-
-       return slapi_int_overlay_init();
-}