ITS#5212

Fix filter normalization

diff --git a/CHANGES b/CHANGES
index 3357b127efa5ee006de40c423b6b58560527e8ce..d456ff0a106aebde9570e701b3dd4867619117ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.7 Engineering
        Fixed slapd paged results control handling (ITS#5191)
        Fixed slapd sasl-host parsing (ITS#5209)
+       Fixed slapd filter normalization (ITS#5212)
        Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210)
        Fixed slapo-syncprov ignore invalid cookies (ITS#5211)
        Documentation

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 8c11f81f5d3e2ed16c47594356a226b54e96e305..46a5c7a6d3572467640c23b6b55a3f7281136817 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -607,7 +607,8 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
 
 simple:
                value = f->f_av_value;
-               if ( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+               if ( f->f_av_desc->ad_type->sat_equality &&
+                       f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
                        f->f_av_desc->ad_type->sat_equality->smr_normalize(
                                (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
                                NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );