From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 31 Jan 2011 21:47:57 +0000 (+0000)
Subject: ITS#6818
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=46d70795255ca200c171b5176f1132f959b9119d;p=openldap

ITS#6818
---

diff --git a/CHANGES b/CHANGES
index b33b930244..eb2b458934 100644
--- a/CHANGES
+++ b/CHANGES
@@ -88,6 +88,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapd-meta with SASL/EXTERNAL (ITS#6642)
 	Fixed slapd-meta matchedDN return code (ITS#6774)
 	Fixed slapd-meta candidate selection (ITS#6799)
+	Fixed slapd-meta attribute normalization (ITS#6818)
 	Fixed slapd-monitor hasSubordinates generation (ITS#6712)
 	Fixed slapd-monitor abandon processing (ITS#6783)
 	Fixed slapd-monitor entry locks (ITS#6787)
diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index c8686fede9..0bdb1f765a 100644
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -267,7 +267,9 @@ map_attr_value(
 			return -1;
 		}
 
-	} else if ( ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+	} else if ( ad->ad_type->sat_equality && 
+		ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER )
+	{
 		if ( ad->ad_type->sat_equality->smr_normalize(
 			(SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
 			NULL, NULL, value, &vtmp, memctx ) )