Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-meta / map.c

diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index da5aede4a0e0c86b52be15efb63034fef561ec8a..7bb172469b7362a308d468688d1351765d9887d3 100644 (file)
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -61,9 +61,6 @@
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
-#undef ldap_debug      /* silence a warning in ldap-int.h */
-#include "../../../libraries/libldap/ldap-int.h"
-
 int
 mapping_cmp ( const void *c1, const void *c2 )
 {
@@ -301,7 +298,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 ) )