libldapschema: adding refernces from LDAPSchemaSyntax to LDAPSchemaMatchingRule and LDAPSchemaLDAPAttributeType

5 files changed, 27 insertions, 3 deletions

diff --git a/lib/libldapschema/libldapschema.h b/lib/libldapschema/libldapschema.h
index f8b3bc5..07a9bf5 100644
--- a/lib/libldapschema/libldapschema.h
+++ b/lib/libldapschema/libldapschema.h
@@ -196,6 +196,10 @@ struct ldap_schema_syntax
    LDAPSchemaModel                        model;
    size_t                                 data_class;
    regex_t                                re;
+   LDAPSchemaMatchingRule **              mtchngrls;
+   size_t                                 mtchngrls_len;
+   LDAPSchemaAttributeType **             attrs;
+   size_t                                 attrs_len;
 };
 
 
diff --git a/lib/libldapschema/lldap.c b/lib/libldapschema/lldap.c
index 26e2bbe..fc8e14e 100644
--- a/lib/libldapschema/lldap.c
+++ b/lib/libldapschema/lldap.c
@@ -52,6 +52,8 @@
 #include "llexer.h"
 #include "lquery.h"
 #include "lerror.h"
+#include "lmemory.h"
+#include "lsort.h"
 
 
 /////////////////
@@ -206,7 +208,8 @@ int ldapschema_fetch(LDAPSchema * lsd, LDAP * ld)
          {
             attr->model.flags |= attrsup->model.flags;
             if (!(attr->syntax))
-               attr->syntax = attrsup->syntax;
+               if ((attr->syntax = attrsup->syntax) != NULL)
+                  ldapschema_insert(lsd, (void ***)&attr->syntax->attrs, &attr->syntax->attrs_len, attr, ldapschema_compar_models);
             if (!(attr->min_upper))
                attr->min_upper = attrsup->min_upper;
             if (!(attr->usage))
diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index e761f7b..ce94e2a 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -618,7 +618,10 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
             attr->min_upper = strtoull(&stridx[1], NULL, 10);
          };
          if ((attr->syntax = ldapschema_oid(lsd, argv[pos], LDAPSCHEMA_SYNTAX)) != NULL)
+         {
             attr->model.flags |= attr->syntax->model.flags;
+            ldapschema_insert(lsd, (void ***)&attr->syntax->attrs, &attr->syntax->attrs_len, attr, ldapschema_compar_models);
+         };
       }
 
       // inteprets attributeType SINGLE-VALUE
@@ -884,7 +887,8 @@ LDAPSchemaMatchingRule * ldapschema_parse_matchingrule(LDAPSchema * lsd, const s
       else if (!(strcasecmp(argv[pos], "SYNTAX")))
       {
          pos++;
-         rule->syntax = ldapschema_oid(lsd, argv[pos], LDAPSCHEMA_SYNTAX);
+         if ((rule->syntax = ldapschema_oid(lsd, argv[pos], LDAPSCHEMA_SYNTAX)) != NULL)
+            ldapschema_insert(lsd, (void ***)&rule->syntax->mtchngrls, &rule->syntax->mtchngrls_len, rule, ldapschema_compar_models);
       }
 
       // handle unknown parameters
diff --git a/lib/libldapschema/lmemory.c b/lib/libldapschema/lmemory.c
index 62da0c8..a151506 100644
--- a/lib/libldapschema/lmemory.c
+++ b/lib/libldapschema/lmemory.c
@@ -780,6 +780,12 @@ void ldapschema_syntax_free(LDAPSchemaSyntax * syntax)
    regfree(&syntax->re);
    ldapschema_object_free(&syntax->model);
 
+   if ((syntax->attrs))
+      free(syntax->attrs);
+
+   if ((syntax->mtchngrls))
+      free(syntax->mtchngrls);
+
    free(syntax);
 
    return;
diff --git a/lib/libldapschema/loutput.c b/lib/libldapschema/loutput.c
index 167c702..4b386b3 100644
--- a/lib/libldapschema/loutput.c
+++ b/lib/libldapschema/loutput.c
@@ -62,7 +62,7 @@
 #define LDAPSCHEMA_WIDTH_HEADER    19
 #define LDAPSCHEMA_WIDTH_INDENT    3
 #define LDAPSCHEMA_WIDTH_FIELD     (LDAPSCHEMA_WIDTH_HEADER-LDAPSCHEMA_WIDTH_INDENT)
-#define LDAPSCHEMA_WIDTH_VALUE      30
+#define LDAPSCHEMA_WIDTH_VALUE      45
 
 
 //////////////////
@@ -416,6 +416,11 @@ void ldapschema_print_list_models(LDAPSchema * lsd,
             key = ((LDAPSchemaAttributeType *)list[pos])->names[0];
          break;
 
+         case LDAPSCHEMA_MATCHINGRULE:
+         if ((((LDAPSchemaMatchingRule *)list[pos])->names))
+            key = ((LDAPSchemaMatchingRule *)list[pos])->names[0];
+         break;
+
          case LDAPSCHEMA_OBJECTCLASS:
          if ((((LDAPSchemaObjectclass *)list[pos])->names))
             key = ((LDAPSchemaObjectclass *)list[pos])->names[0];
@@ -623,6 +628,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_spec(lsd, syntax->model.spec);
    ldapschema_print_definition(lsd, &syntax->model);
    ldapschema_print_issues(lsd, &syntax->model);