From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 10 Jul 2008 01:26:02 +0000 (+0000)
Subject: ITS#5540 (partial)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_11~32
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ecc2df63612af80f1953bbf31dd1395d20f8c9d7;p=openldap

ITS#5540 (partial)
---

diff --git a/CHANGES b/CHANGES
index 0e80ec19ac..cada313159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.11 Engineering
 	Fixed liblber ber_get_next length decoding (ITS#5580)
 	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 crash with no listeners (ITS#5563)
 	Fixed slapd sets memory leak (ITS#5557)
 	Fixed slapd-sock, back-shell buffer count (ITS#5558)
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 450cbbfc8e..bd93b5c7b4 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -5507,6 +5507,12 @@ config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
 	oc_at = attr_find( e->e_attrs, slap_schema.si_ad_objectClass );
 	rc = structural_class(oc_at->a_vals, &oc, NULL, &text, c->cr_msg,
 		sizeof(c->cr_msg), op ? op->o_tmpmemctx : NULL );
+	if ( rc != LDAP_SUCCESS ) {
+		Debug( LDAP_DEBUG_ANY,
+			"config_build_entry: build \"%s\" failed: \"%s\"\n",
+			rdn->bv_val, text, 0);
+		return NULL;
+	}
 	attr_merge_normalize_one(e, slap_schema.si_ad_structuralObjectClass, &oc->soc_cname, NULL );
 	if ( op ) {
 		op->ora_e = e;