From: Ondřej Kuzník <ondra@openldap.org>
Date: Mon, 21 May 2018 14:37:50 +0000 (+0100)
Subject: ITS#8859 Record the correct RDN
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f2caff7b9fa85af0b6823849007ef9a3591c3db;p=thirdparty%2Fopenldap.git

ITS#8859 Record the correct RDN
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 341df08666..1f1647b54a 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -7200,6 +7200,7 @@ config_back_db_open( BackendDB *be, ConfigReply *cr )
 	 */
 	
 	c.line = 0;
+	i = 0;
 	LDAP_STAILQ_FOREACH( bi, &backendInfo, bi_next) {
 		if (!bi->bi_cf_ocs) {
 			/* If it only supports the old config mech, complain. */
@@ -7215,7 +7216,8 @@ config_back_db_open( BackendDB *be, ConfigReply *cr )
 
 		rdn.bv_val = c.log;
 		rdn.bv_len = snprintf(rdn.bv_val, sizeof( c.log ),
-			"%s=%s", cfAd_backend->ad_cname.bv_val, bi->bi_type);
+			"%s=" SLAP_X_ORDERED_FMT "%s", cfAd_backend->ad_cname.bv_val,
+			i, bi->bi_type);
 		if ( rdn.bv_len >= sizeof( c.log ) ) {
 			/* FIXME: holler ... */ ;
 		}
@@ -7225,6 +7227,7 @@ config_back_db_open( BackendDB *be, ConfigReply *cr )
 		if ( !e ) {
 			return -1;
 		}
+		i++;
 	}
 
 	/* Create database nodes... */