ITS#6818

diff --git a/CHANGES b/CHANGES
index b33b93024481ea1c051b545ca5dfb9ddbe40d789..eb2b458934fb802916df3e215e916ad9ce70394d 100644 (file)
--- 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 c8686fede91fe49ae3ed8afaec91ce9169067135..0bdb1f765a123c66e29122a06d5d690004b0f33e 100644 (file)
--- 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 ) )