]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/at.c
fix typo
[openldap] / servers / slapd / at.c
index de44c27561bc293977be91d68e80f48d01e5b03c..9339c51e6e7f80ff4c7bc521ef2d4aef135d4c11 100644 (file)
@@ -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;
@@ -925,6 +939,11 @@ error_return:;
                        at->at_oid = oidm;
                }
 
+               if ( soidm ) {
+                       SLAP_FREE( at->at_syntax_oid );
+                       at->at_syntax_oid = soidm;
+               }
+
        } else if ( rsat ) {
                *rsat = sat;
        }