From 01686daa4d910bcec3e5abba570b2754b21a74a3 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 6 Aug 2008 01:11:13 +0000 Subject: [PATCH] ITS#5642 don't inherit custom attributes --- servers/slapd/at.c | 18 ++++++++++++++++-- servers/slapd/schema_prep.c | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/servers/slapd/at.c b/servers/slapd/at.c index de44c27561..54d197c495 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.c @@ -722,8 +722,22 @@ at_add( * its own superiorss */ if ( sat->sat_sup ) { - sat->sat_syntax = sat->sat_sup->sat_syntax; - sat->sat_equality = sat->sat_sup->sat_equality; + 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; diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index 5bab4a2d0a..42f9a5e943 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -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; } } -- 2.39.5