From 17cce56679836a23389c169091c372a44e7f4309 Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Thu, 11 Apr 2013 13:06:50 +0200 Subject: [PATCH] let idl switch old work, suppress auto adjust --- ldap/servers/slapd/back-ldbm/dblayer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c index 6d2d1e1..ab0a16e 100644 --- a/ldap/servers/slapd/back-ldbm/dblayer.c +++ b/ldap/servers/slapd/back-ldbm/dblayer.c @@ -2024,7 +2024,7 @@ int dblayer_instance_start(backend *be, int mode) /* check the DBVERSION and reset idl-switch if needed (DS6.2) */ /* from the next major rel, we won't do this and just upgrade */ if (!(li->li_flags & LI_FORCE_MOD_CONFIG)) { - adjust_idl_switch(ldbmversion, li); + /* adjust_idl_switch(ldbmversion, li); */ } slapi_ch_free_string(&ldbmversion); @@ -2951,7 +2951,8 @@ _dblayer_set_db_callbacks(dblayer_private *priv, DB *dbp, struct attrinfo *ai) return rc; #endif - if (idl_get_idl_new() && !(ai->ai_indexmask & INDEX_VLV)) { + if ((idl_get_idl_new() || 0 == strcasecmp(ai->ai_type, LDBM_ENTRYRDN_STR) ) + && !(ai->ai_indexmask & INDEX_VLV)) { rc = dbp->set_flags(dbp, DB_DUP | DB_DUPSORT); if (rc) return rc; @@ -6815,7 +6816,7 @@ int dblayer_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task, char * } else { - adjust_idl_switch(ldbmversion, li); + /* adjust_idl_switch(ldbmversion, li); */ slapi_ch_free_string(&ldbmversion); slapi_ch_free_string(&ldbmversion); } -- 1.7.11.7