libldapschema: adding refernces from LDAPSchemaMatchingRule to LDAPSchemaLDAPAttributeType

3 files changed, 17 insertions, 4 deletions

diff --git a/lib/libldapschema/lldap.c b/lib/libldapschema/lldap.c
index fc8e14e..e546795 100644
--- a/lib/libldapschema/lldap.c
+++ b/lib/libldapschema/lldap.c
@@ -215,11 +215,14 @@ int ldapschema_fetch(LDAPSchema * lsd, LDAP * ld)
             if (!(attr->usage))
                attr->usage = attrsup->usage;
             if (!(attr->equality))
-               attr->equality = attrsup->equality;
+               if ((attr->equality = attrsup->equality) != NULL)
+                  ldapschema_insert(lsd, (void ***)&attr->equality->used_by, &attr->equality->used_by_len, attr, ldapschema_compar_models);
             if (!(attr->ordering))
-               attr->ordering = attrsup->ordering;
+               if ((attr->ordering = attrsup->ordering) != NULL)
+                  ldapschema_insert(lsd, (void ***)&attr->ordering->used_by, &attr->ordering->used_by_len, attr, ldapschema_compar_models);
             if (!(attr->substr))
-               attr->substr = attrsup->substr;
+               if ((attr->substr = attrsup->substr) != NULL)
+                  ldapschema_insert(lsd, (void ***)&attr->substr->used_by, &attr->substr->used_by_len, attr, ldapschema_compar_models);
          };
       };
    };
diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index ce94e2a..b0c2670 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -589,7 +589,10 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
       {
          pos++;
          if ((alias = ldapschema_find_alias(lsd, argv[pos], lsd->mtchngrls, lsd->mtchngrls_len)) != NULL)
+         {
             attr->equality = alias->matchingrule;
+            ldapschema_insert(lsd, (void ***)&attr->equality->used_by, &attr->equality->used_by_len, attr, ldapschema_compar_models);
+         };
       }
 
       // inteprets attributeType ORDERING
@@ -597,7 +600,10 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
       {
          pos++;
          if ((alias = ldapschema_find_alias(lsd, argv[pos], lsd->mtchngrls, lsd->mtchngrls_len)) != NULL)
+         {
             attr->ordering = alias->matchingrule;
+            ldapschema_insert(lsd, (void ***)&attr->ordering->used_by, &attr->ordering->used_by_len, attr, ldapschema_compar_models);
+         };
       }
 
       // inteprets attributeType SUBSTR
@@ -605,7 +611,10 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
       {
          pos++;
          if ((alias = ldapschema_find_alias(lsd, argv[pos], lsd->mtchngrls, lsd->mtchngrls_len)) != NULL)
+         {
             attr->substr = alias->matchingrule;
+            ldapschema_insert(lsd, (void ***)&attr->substr->used_by, &attr->substr->used_by_len, attr, ldapschema_compar_models);
+         };
       }
 
       // inteprets attributeType SYNTAX
diff --git a/lib/libldapschema/loutput.c b/lib/libldapschema/loutput.c
index 4b386b3..0d7afac 100644
--- a/lib/libldapschema/loutput.c
+++ b/lib/libldapschema/loutput.c
@@ -553,6 +553,7 @@ void ldapschema_print_obj_matchingrule(LDAPSchema * lsd, LDAPSchemaMatchingRule
       ldapschema_print_line("syntax:", buff);
    };
 
+   ldapschema_print_list_models(lsd, "used by:",  (LDAPSchemaModel **)mtchngrl->used_by, mtchngrl->used_by_len);
    ldapschema_print_extensions(lsd, &mtchngrl->model);
    ldapschema_print_definition(lsd, &mtchngrl->model);
    ldapschema_print_issues(lsd, &mtchngrl->model);
@@ -628,8 +629,8 @@ void ldapschema_print_obj_syntax(LDAPSchema * lsd, LDAPSchemaSyntax * syntax)
    ldapschema_print_data_class(lsd, syntax->data_class);
    ldapschema_print_flags(lsd, &syntax->model);
    ldapschema_print_extensions(lsd, &syntax->model);
-   ldapschema_print_list_models(lsd, "attributeTypes:",  (LDAPSchemaModel **)syntax->attrs,     syntax->attrs_len);
    ldapschema_print_list_models(lsd, "matchingRules:",   (LDAPSchemaModel **)syntax->mtchngrls, syntax->mtchngrls_len);
+   ldapschema_print_list_models(lsd, "used by:",  (LDAPSchemaModel **)syntax->attrs,     syntax->attrs_len);
    ldapschema_print_spec(lsd, syntax->model.spec);
    ldapschema_print_definition(lsd, &syntax->model);
    ldapschema_print_issues(lsd, &syntax->model);