SLAPD_SCHEMA_NOT_COMPAT: Fix normalization bugs

Disable cn=Schema "merging" messages

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index b8ddcc9201e2a602f6d826750b8c5f5d12b53843..14c20bd19f10370f30c6d901a2d3e1191faf5433 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -569,8 +569,10 @@ at_schema_info( Entry *e )
                        return -1;
                }
                val.bv_len = strlen( val.bv_val );
+#if 0
                Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
                       (long) val.bv_len, val.bv_val, 0 );
+#endif
                attr_merge( e, ad_attributeTypes, vals );
                ldap_memfree( val.bv_val );
        }

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 6f715ad2dd43df4312387c52eabc6932cb931575..390b670911d14e8dab1ddb5c02cf4acc897cdab4 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -211,8 +211,10 @@ int mr_schema_info( Entry *e )
                }
 
                val.bv_len = strlen( val.bv_val );
+#if 0
                Debug( LDAP_DEBUG_TRACE, "Merging mr [%ld] %s\n",
               (long) val.bv_len, val.bv_val, 0 );
+#endif
                attr_merge( e, ad_matchingRules, vals );
                ldap_memfree( val.bv_val );
        }

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 0b6feef114e54caed739bc2d840a6d4399724b11..bee49029f409c3cc4f85253b3c64bb3f6f398daa 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -481,8 +481,10 @@ oc_schema_info( Entry *e )
                        return -1;
                }
                val.bv_len = strlen( val.bv_val );
+#if 0
                Debug( LDAP_DEBUG_TRACE, "Merging oc [%ld] %s\n",
               (long) val.bv_len, val.bv_val, 0 );
+#endif
                attr_merge( e, ad_objectClasses, vals );
                ldap_memfree( val.bv_val );
        }

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8a63407093da4adb4be447839544a6cc8eaf5ff1..945eb5bd782f124b994bc3144f0e3fc4b0c70080 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -126,7 +126,7 @@ UTF8StringNormalize(
        *q = '\0';
 
        newval->bv_len = q - newval->bv_val;
-       normalized = &newval;
+       *normalized = newval;
 
        return 0;
 }
@@ -300,7 +300,7 @@ IA5StringNormalize(
        *q = '\0';
 
        newval->bv_len = q - newval->bv_val;
-       normalized = &newval;
+       *normalized = newval;
 
        return 0;
 }

diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index ef968fb189682767f25a8c5680bfe4714fae4618..51c503acc21c22c977aea3f9e33a9687a40ee363 100644 (file)
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -183,8 +183,10 @@ syn_schema_info( Entry *e )
                        return -1;
                }
                val.bv_len = strlen( val.bv_val );
+#if 0
                Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
               (long) val.bv_len, val.bv_val, 0 );
+#endif
                attr_merge( e, ad_ldapSyntaxes, vals );
                ldap_memfree( val.bv_val );
        }