From: Howard Chu <hyc@openldap.org>
Date: Fri, 9 Feb 2007 18:49:38 +0000 (+0000)
Subject: ITS#4833 refix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6273ef28a1a1c4ccc5ccd6ee9e1e027369f3437;p=openldap

ITS#4833 refix
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 59ffcdd0e3..ecd3bab137 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -3871,6 +3871,8 @@ config_rename_one( Operation *op, SlapReply *rs, Entry *e,
 		op->o_callback = &sc;
 		op->orr_newrdn = *newrdn;
 		op->orr_nnewrdn = *nnewrdn;
+		op->orr_newSup = NULL;
+		op->orr_nnewSup = NULL;
 		op->orr_deleteoldrdn = 1;
 		op->orr_modlist = NULL;
 		slap_modrdn2mods( op, rs );
@@ -3994,6 +3996,10 @@ check_name_index( CfEntryInfo *parent, ConfigType ce_type, Entry *e,
 		if ( ce->ce_type == ce_type ) nsibs++;
 	}
 
+	/* account for -1 frontend */
+	if ( ce_type == Cft_Database )
+		nsibs--;
+
 	if ( index != nsibs ) {
 		if ( gotindex ) {
 			if ( index < nsibs ) {
@@ -4005,8 +4011,6 @@ check_name_index( CfEntryInfo *parent, ConfigType ce_type, Entry *e,
 		}
 		if ( !isfrontend && index == -1 ) {
 			index = nsibs;
-			if ( ce_type == Cft_Database )
-				index--;
 		}
 
 		/* just make index = nsibs */