Additional fix for ITS#4522. The "dn=" ist not optional.

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index ab5f17b7a72cdeca721a9ff64d37b98e92e571c4..4476d6a40e8317b5267100ed95ed27254764877a 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,6 @@
 
 #include "slap.h"
 #include "lber_pvt.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
 
 #include "ldap_rq.h"
 
@@ -67,6 +64,7 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
  */
 ldap_pvt_thread_pool_t connection_pool;
 int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
+int            slap_tool_thread_max = 1;
 #ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t        gmtime_mutex;
 #endif
@@ -93,7 +91,7 @@ slap_init( int mode, const char *name )
 
        if ( slapMode != SLAP_UNDEFINED_MODE ) {
                /* Make sure we write something to stderr */
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
                 name, slapMode, mode );
@@ -105,7 +103,7 @@ slap_init( int mode, const char *name )
 
 #ifdef SLAPD_MODULES
        if ( module_init() != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: module_init failed\n",
                        name, 0, 0 );
@@ -114,7 +112,7 @@ slap_init( int mode, const char *name )
 #endif
 
        if ( slap_schema_init( ) != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: slap_schema_init failed\n",
                    name, 0, 0 );
@@ -124,8 +122,6 @@ slap_init( int mode, const char *name )
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
-               ldap_pvt_thread_pool_init( &connection_pool,
-                               connection_pool_max, 0);
 
                /* FALLTHRU */
        case SLAP_TOOL_MODE:
@@ -136,6 +132,8 @@ slap_init( int mode, const char *name )
 
                slap_name = name;
 
+               ldap_pvt_thread_pool_init( &connection_pool,
+                               connection_pool_max, 0);
                ldap_pvt_thread_mutex_init( &entry2str_mutex );
                ldap_pvt_thread_mutex_init( &replog_mutex );
 
@@ -174,7 +172,7 @@ slap_init( int mode, const char *name )
                break;
 
        default:
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                        "%s init: undefined mode (%d).\n", name, mode, 0 );
 
@@ -183,7 +181,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( slap_controls_init( ) != 0 ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: slap_controls_init failed\n",
                    name, 0, 0 );
@@ -201,7 +199,7 @@ slap_init( int mode, const char *name )
 #endif
 
        if ( frontend_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: frontend_init failed\n",
                    name, 0, 0 );
@@ -209,7 +207,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( overlay_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: overlay_init failed\n",
                    name, 0, 0 );
@@ -217,7 +215,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( glue_sub_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: glue/subordinate init failed\n",
                    name, 0, 0 );
@@ -226,7 +224,7 @@ slap_init( int mode, const char *name )
        }
 
        if ( acl_init() ) {
-               ldap_debug |= 1;
+               slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
                    "%s: acl_init failed\n",
                    name, 0, 0 );
@@ -238,50 +236,22 @@ slap_init( int mode, const char *name )
 
 int slap_startup( Backend *be )
 {
-       int rc;
-
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
 
 
-       rc = backend_startup( be );
-
-#ifdef LDAP_SLAPI
-       if( rc == 0 ) {
-               Slapi_PBlock *pb = slapi_pblock_new();
-
-               if ( slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_START_FN, pb ) < 0 ) {
-                       rc = -1;
-               }
-               slapi_pblock_destroy( pb );
-       }
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_startup( be );
 }
 
 int slap_shutdown( Backend *be )
 {
-       int rc;
-#ifdef LDAP_SLAPI
-       Slapi_PBlock *pb;
-#endif
-
        Debug( LDAP_DEBUG_TRACE,
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
 
        /* let backends do whatever cleanup they need to do */
-       rc = backend_shutdown( be ); 
-
-#ifdef LDAP_SLAPI
-       pb = slapi_pblock_new();
-       (void) slapi_int_call_plugins( frontendDB, SLAPI_PLUGIN_CLOSE_FN, pb );
-       slapi_pblock_destroy( pb );
-#endif /* LDAP_SLAPI */
-
-       return rc;
+       return backend_shutdown( be ); 
 }
 
 int slap_destroy(void)