Use backend#0 for config, tools default to #1

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 6c556bd1ffbbfb53beee4c32d8cc8381dfad9aaa..b194f112971867a99c2978468e60cc6a1fa6e017 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -344,6 +344,7 @@ config_back_initialize( BackendInfo *bi )
        return 0;
 }
 
+
 void config_back_init( ConfigFile *cfp, ConfigTable *ct )
 {
        BackendInfo bi = {0};
@@ -355,10 +356,6 @@ void config_back_init( ConfigFile *cfp, ConfigTable *ct )
        bi.bi_init = config_back_initialize;
        bi.bi_cf_table = ct;
        backend_add( &bi );
-       /* FIXME */
-       if ( slapMode & SLAP_TOOL_MODE ) {
-               return;
-       }
        be = backend_db_init( bi.bi_type );
        ber_str2bv( CONFIG_DN, 0, 1, &be->be_rootdn );
        ber_dupbv( &be->be_rootndn, &be->be_rootdn );

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 41642c6ceda19e2fcb818eded7d78ce624f89c58..56c2b613c1bba25eb24bc9a94b3fa2f687d276d5 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -201,7 +201,7 @@ slap_tool_init(
                        break;
 
                case 'n':       /* which config file db to index */
-                       dbnum = atoi( optarg ) - 1;
+                       dbnum = atoi( optarg );
                        break;
 
                case 'q':       /* turn on quick */
@@ -441,7 +441,7 @@ slap_tool_init(
                        exit( EXIT_FAILURE );
                }
                
-               be = &backends[dbnum=0];
+               be = &backends[dbnum=1];
                /* If just doing the first by default and it is a
                 * glue subordinate, find the master.
                 */