Commit 11ef2704 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

SLAPD_SCHEMA_NOT_COMPAT: Fix normalization bugs

Disable cn=Schema "merging" messages
parent 80d52b18
......@@ -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 );
}
......
......@@ -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 );
}
......
......@@ -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 );
}
......
......@@ -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;
}
......
......@@ -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 );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment