SLAPD_SCHEMA_NOT_COMPAT: at least make filters not loop

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index e61922e79ffec7a242aa663a13b52f3e9fe4a60d..77f191256b328e6c751665dade898498e9a6f261 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -260,7 +260,9 @@ test_ava_filter(
                for ( i = 0; a->a_vals[i] != NULL; i++ ) {
                        int rc;
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+                       rc = 0;
+#else
                        rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax,
                                3 );
 #endif

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 21538c23e18a281a7d46e671b3360e737b000b96..ec7bc11f8412cf4a601aa21a38455a676f8075de 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -128,13 +128,18 @@ value_normalize(
                return LDAP_INAPPROPRIATE_MATCHING;
        }
 
-       rc = (mr->smr_normalize)( usage,
-               ad->ad_type->sat_syntax,
-               mr, in, out );
+       if( mr->smr_normalize ) {
+               rc = (mr->smr_normalize)( usage,
+                       ad->ad_type->sat_syntax,
+                       mr, in, out );
+
+               if( rc != LDAP_SUCCESS ) {
+                       *text = "unable to normalize value";
+                       return LDAP_INVALID_SYNTAX;
+               }
 
-       if( rc != LDAP_SUCCESS ) {
-               *text = "unable to normalize value";
-               return LDAP_INVALID_SYNTAX;
+       } else {
+               *out = ber_bvdup( in );
        }
 
        return LDAP_SUCCESS;