Commit ec79a66d authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5571

parent 88d9df29
...@@ -5,6 +5,7 @@ OpenLDAP 2.4.11 Engineering ...@@ -5,6 +5,7 @@ OpenLDAP 2.4.11 Engineering
Added libldap assertion control (ITS#5560) Added libldap assertion control (ITS#5560)
Fixed libldap GnuTLS CRL result handling (ITS#5577) Fixed libldap GnuTLS CRL result handling (ITS#5577)
Fixed slapd check for structural_class failures (ITS#5540) Fixed slapd check for structural_class failures (ITS#5540)
Fixed slapd config backend renumbering (ITS#5571)
Fixed slapd configContext OID (ITS#5383) Fixed slapd configContext OID (ITS#5383)
Fixed slapd crash with no listeners (ITS#5563) Fixed slapd crash with no listeners (ITS#5563)
Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540) Fixed slapd equality rules for olcRootDN/olcSchemaDN (ITS#5540)
......
...@@ -3992,6 +3992,11 @@ cfAddDatabase( CfEntryInfo *p, Entry *e, struct config_args_s *ca ) ...@@ -3992,6 +3992,11 @@ cfAddDatabase( CfEntryInfo *p, Entry *e, struct config_args_s *ca )
if ( p->ce_type != Cft_Global ) { if ( p->ce_type != Cft_Global ) {
return LDAP_CONSTRAINT_VIOLATION; 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 */ ca->be = frontendDB; /* just to get past check_vals */
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
...@@ -5457,7 +5462,7 @@ config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent, ...@@ -5457,7 +5462,7 @@ config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
ce->ce_parent = parent; ce->ce_parent = parent;
if ( parent ) { if ( parent ) {
pdn = parent->ce_entry->e_nname; 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 && for ( ceprev = parent->ce_kids; ceprev->ce_sibs &&
ceprev->ce_type <= ce->ce_type; ceprev->ce_type <= ce->ce_type;
ceprev = ceprev->ce_sibs ); ceprev = ceprev->ce_sibs );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment