ITS#3226: Clear attribute flags after schema_check failed

[openldap] / servers / slapd / back-bdb / config.c

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 8e2e93b3a889e838aefe2117dae4380b3c4a643b..4d2dbbbaba7a456457e8247faf781793cf39438d 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -155,10 +155,6 @@ bdb_db_config(
                }
                bdb->bi_cache.c_maxsize = atoi( argv[1] );
 
-               /* default IDL cache to 10x entry cache */
-               if ( bdb->bi_idl_cache_max_size == 0 )
-                       bdb->bi_idl_cache_max_size = 10 * bdb->bi_cache.c_maxsize;
-
        /* depth of search stack cache in units of (IDL)s */
        } else if ( strcasecmp( argv[0], "searchstack" ) == 0 ) {
                if ( argc < 2 ) {
@@ -184,8 +180,8 @@ bdb_db_config(
                                fname, lineno );
                        return( 1 );
                }
-               bdb->bi_idl_cache_max_size = atoi( argv[1] );
-
+               if ( !( slapMode & SLAP_TOOL_MODE ) )
+                       bdb->bi_idl_cache_max_size = atoi( argv[1] );
        } else if ( strcasecmp( argv[0], "sessionlog" ) == 0 ) {
                int se_id = 0, se_size = 0;
                struct slap_session_entry *sent;
@@ -203,7 +199,6 @@ bdb_db_config(
                }
 
                se_id = atoi( argv[1] );
-               se_size = atoi( argv[2] );
 
                if ( se_id < 0 || se_id > 999 ) {
 #ifdef NEW_LOGGING
@@ -218,7 +213,8 @@ bdb_db_config(
                        return( 1 );
                }
 
-               if ( se_size < 0 || se_size > 999 ) {
+               se_size = atoi( argv[2] );
+               if ( se_size < 0 ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG( CONFIG, CRIT,
                                "%s: line %d: session log size %d is negative\n",