From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 24 May 2000 00:59:58 +0000 (+0000)
Subject: SLAPD_SCHEMA_NOT_COMPAT: Fix normalization bugs
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2883
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=11ef270498d35430f1be45c29f2a3e9c48b6103d;p=openldap

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 b8ddcc9201..14c20bd19f 100644
--- 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 6f715ad2dd..390b670911 100644
--- 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 0b6feef114..bee49029f4 100644
--- 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 8a63407093..945eb5bd78 100644
--- 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 ef968fb189..51c503acc2 100644
--- 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 );
 	}