Commit bfe9bbe6 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5642

parent cecf6468
......@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.12 Engineering
Fixed liblutil executables on Windows (ITS#5604)
Fixed slapd custom attribute inheritance (ITS#5642)
Fixed slapd firstComponentMatch normalization (ITS#5634)
Fixed slapd socket closing on Windows (ITS#5606)
Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614)
......
......@@ -722,8 +722,22 @@ at_add(
* its own superiorss
*/
if ( sat->sat_sup ) {
Syntax *syn = syn_find(sat->sat_sup->sat_syntax->ssyn_oid);
if ( syn != sat->sat_sup->sat_syntax ) {
sat->sat_syntax = ch_malloc( sizeof( Syntax ));
*sat->sat_syntax = *sat->sat_sup->sat_syntax;
} else {
sat->sat_syntax = sat->sat_sup->sat_syntax;
}
if ( sat->sat_sup->sat_equality ) {
MatchingRule *mr = mr_find( sat->sat_sup->sat_equality->smr_oid );
if ( mr != sat->sat_sup->sat_equality ) {
sat->sat_equality = ch_malloc( sizeof( MatchingRule ));
*sat->sat_equality = *sat->sat_sup->sat_equality;
} else {
sat->sat_equality = sat->sat_sup->sat_equality;
}
}
sat->sat_approx = sat->sat_sup->sat_approx;
sat->sat_ordering = sat->sat_sup->sat_ordering;
sat->sat_substr = sat->sat_sup->sat_substr;
......
......@@ -1266,7 +1266,6 @@ slap_schema_load( void )
mr->smr_filter = ad_map[i].ssam_mr_filter;
}
/* FIXME: no-one will free this at exit */
(*adp)->ad_type->sat_equality = mr;
}
}
......
Supports Markdown
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