ITS#5571

CHANGES

@@ -5,6 +5,7 @@ OpenLDAP 2.4.11 Engineering
 	Added libldap assertion control (ITS#5560)
 	Fixed libldap GnuTLS CRL result handling (ITS#5577)
 	Fixed slapd check for structural_class failures (ITS#5540)
+	Fixed slapd config backend renumbering (ITS#5571)
 	Fixed slapd configContext OID (ITS#5383)
 	Fixed slapd crash with no listeners (ITS#5563)
 	Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540)

servers/slapd/bconfig.c

@@ -3992,6 +3992,11 @@ cfAddDatabase( CfEntryInfo *p, Entry *e, struct config_args_s *ca )
 	if ( p->ce_type != Cft_Global ) {
 		return LDAP_CONSTRAINT_VIOLATION;
 	}
+	/* config must be {0}, nothing else allowed */
+	if ( !strncmp( e->e_nname.bv_val, "olcDatabase={0}", STRLENOF("olcDatabase={0}")) &&
+		strcmp( e->e_nname.bv_val + STRLENOF("olcDatabase={0}"), "config" )) {
+		return LDAP_CONSTRAINT_VIOLATION;
+	}
 	ca->be = frontendDB;	/* just to get past check_vals */
 	return LDAP_SUCCESS;
 }
@@ -5457,7 +5462,7 @@ config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
 	ce->ce_parent = parent;
 	if ( parent ) {
 		pdn = parent->ce_entry->e_nname;
-		if ( parent->ce_kids )
+		if ( parent->ce_kids && parent->ce_kids->ce_type <= ce->ce_type )
 			for ( ceprev = parent->ce_kids; ceprev->ce_sibs &&
 				ceprev->ce_type <= ce->ce_type;
 				ceprev = ceprev->ce_sibs );