libldapschema: refactoring error message functions and error messages

5 files changed, 97 insertions, 75 deletions

diff --git a/lib/libldapschema/lerror.c b/lib/libldapschema/lerror.c
index 0cef955..45cac7b 100644
--- a/lib/libldapschema/lerror.c
+++ b/lib/libldapschema/lerror.c
@@ -51,6 +51,7 @@
 #include <stdlib.h>
 
 #include "lmemory.h"
+#include "lsort.h"
 
 
 /////////////////
@@ -102,73 +103,47 @@ int ldapschema_errno( LDAPSchema * lsd )
 /// @see       ldapschema_free, ldapschema_initialize, ldapschema_err2string
 int ldapschema_schema_err(LDAPSchema * lsd, LDAPSchemaModel * mod, const char * fmt, ... )
 {
-   char        buff[512];
-   va_list     args;
-   char      * str;
-   const char  * type;
-   size_t        len;
+   char           buff[512];
+   va_list        args;
+   char *         str;
+   char **        tmplist;
+   char ***       listp;
+   int            err;
 
    assert(lsd != NULL);
    assert(fmt != NULL);
 
-
-   // initialize errors if first error
-   if (!(lsd->schema_errs))
-   {
-      if ((lsd->schema_errs = malloc(sizeof(char *)*2)) == NULL)
-         return(lsd->errcode = LDAPSCHEMA_NO_MEMORY);
-      lsd->schema_errs[0] = NULL;
-   };
-
-   // determine object type
+   // determines which list
+   listp = &lsd->schema_errs;
    if ((mod))
-   {
-      switch(mod->type)
-      {
-         case LDAPSCHEMA_ATTRIBUTETYPE:   type = "attributeType";    break;
-         case LDAPSCHEMA_OBJECTCLASS:     type = "objectClass";      break;
-         case LDAPSCHEMA_SYNTAX:          type = "ldapSyntax";       break;
-         case LDAPSCHEMA_MATCHINGRULE:    type = "matchingRules";    break;
-         default:                         type = "unknown";          break;
-      };
-   } else
-   {
-      type = "";
-   };
+      listp = &mod->errors;
 
-   // save definition if first error for object
-   if (lsd->schema_errs_cur != mod)
+   // initialize errors if first error
+   if (!(*listp))
    {
-      lsd->schema_errs_cnt++;
-      snprintf(buff, sizeof(buff), "%s %zu: ", type, lsd->schema_errs_cnt);
-      len = strlen(buff);
-      snprintf(&buff[len], sizeof(buff)-len, "definition: %s", mod->definition);
-      if ((str = strdup(buff)) == NULL)
-         return(lsd->errcode = LDAPSCHEMA_NO_MEMORY);
-      if ((lsd->schema_errs = ldapschema_value_add(lsd->schema_errs, str, NULL)) == NULL)
-      {
-         free(str);
+      if ((*listp = malloc(sizeof(char *)*2)) == NULL)
          return(lsd->errcode = LDAPSCHEMA_NO_MEMORY);
-      };
+      bzero(*listp, sizeof(char *)*2);
    };
 
-   // create error header
-   snprintf(buff, sizeof(buff), "%s %zu: ", type, lsd->schema_errs_cnt);
-   len = strlen(buff);
-
    // process error message
    va_start(args, fmt);
-   vsnprintf(&buff[len], sizeof(buff)-len, fmt, args);
+   vsnprintf(buff, sizeof(buff), fmt, args);
    va_end(args);
 
    // save error
    if ((str = strdup(buff)) == NULL)
       return(lsd->errcode = LDAPSCHEMA_NO_MEMORY);
-   if ((lsd->schema_errs = ldapschema_value_add(lsd->schema_errs, str, NULL)) == NULL)
+   if ((tmplist = ldapschema_value_add(*listp, str, NULL)) == NULL)
    {
       free(str);
       return(lsd->errcode = LDAPSCHEMA_NO_MEMORY);
    };
+   *listp = tmplist;
+
+   // adds object to error list
+   if ((err = ldapschema_insert(lsd, (void ***)&lsd->objerrs, &lsd->objerrs_len, mod, ldapschema_compar_models)) > 0)
+      return(lsd->errcode);
 
    // set error code
    lsd->errcode = LDAPSCHEMA_SCHEMA_ERROR;
@@ -179,28 +154,64 @@ int ldapschema_schema_err(LDAPSchema * lsd, LDAPSchemaModel * mod, const char *
 
 char ** ldapschema_schema_errors(LDAPSchema * lsd )
 {
-   char     ** errs;
-   size_t      len;
-   size_t      pos;
+   int                  len;
+   size_t               x;
+   size_t               y;
+   char                 buff[256];
+   char *               str;
+   char **              errs;
+   char **              tmperrs;
+   LDAPSchemaModel *    mod;
 
    assert(lsd != NULL);
 
-   if (!(lsd->schema_errs))
+   // if not errors, exit
+   if ( (!(lsd->schema_errs)) && (!(lsd->objerrs)) )
       return(NULL);
 
-   for(len = 0; ((lsd->schema_errs[len])); len++);
-   if ((errs = malloc(sizeof(char *)*(len+1))) == NULL)
+   // initialize list
+   if ((errs = malloc(sizeof(char *)*2)) == NULL)
       return(NULL);
+   errs[0]  = NULL;
+   len      = 0;
 
-   for(pos = 0; pos < len; pos++)
+   // copy server errors
+   for(x = 0; (((lsd->schema_errs)) && ((lsd->schema_errs[x]))); x++)
    {
-      if ((errs[pos] = strdup(lsd->schema_errs[pos])) == NULL)
+      snprintf(buff, sizeof(buff), "server: %s", lsd->schema_errs[x]);
+      if ((str = strdup(buff)) == NULL)
+      {
+         ldapschema_value_free(errs);
+         return(NULL);
+      };
+      if ((tmperrs = ldapschema_value_add(errs, str, &len)) == NULL)
       {
          ldapschema_value_free(errs);
          return(NULL);
       };
+      errs = tmperrs;
+   };
+
+   // loop through objects and copy errors
+   for(x = 0; x < lsd->objerrs_len; x++)
+   {
+      mod = lsd->objerrs[x].model;
+      for(y = 0; ((mod->errors[y])); y++)
+      {
+         snprintf(buff, sizeof(buff), "%s: %s: %s", ldapschema_type_name(mod->type), mod->oid, mod->errors[y]);
+         if ((str = strdup(buff)) == NULL)
+         {
+            ldapschema_value_free(errs);
+            return(NULL);
+         };
+         if ((tmperrs = ldapschema_value_add(errs, str, &len)) == NULL)
+         {
+            ldapschema_value_free(errs);
+            return(NULL);
+         };
+         errs = tmperrs;
+      };
    };
-   errs[pos] = NULL;
 
    return(errs);
 }
diff --git a/lib/libldapschema/libldapschema.h b/lib/libldapschema/libldapschema.h
index 12e07c2..f8b3bc5 100644
--- a/lib/libldapschema/libldapschema.h
+++ b/lib/libldapschema/libldapschema.h
@@ -74,6 +74,8 @@ struct ldap_schema
 {
    int32_t                                errcode;          ///< last error code
    int32_t                                pad32;
+   size_t                                 objerrs_len;      ///< number of objects with errors
+   LDAPSchemaPointer *                    objerrs;          ///< objects with errors
    LDAPSchemaPointer *                    dups;             ///< array of duplicate oids
    size_t                                 dups_len;         ///< length of duplicate array
    LDAPSchemaPointer *                    oids;             ///< array of all known oids
@@ -87,8 +89,6 @@ struct ldap_schema
    LDAPSchemaAlias **                     objclses;         ///< array of objectClasses
    size_t                                 objclses_len;     ///< length of objectClasses array
    char **                                schema_errs;      ///< list of schema errors discovered
-   size_t                                 schema_errs_cnt;  ///< number of objects with errors
-   LDAPSchemaModel   *                    schema_errs_cur;  ///< reference to current object being reported (may contain multiple errors)
 };
 
 
@@ -120,6 +120,7 @@ struct ldap_schema_model
    const LDAPSchemaSpec *                 spec;
    LDAPSchemaExtension  **                extensions;
    size_t                                 extensions_len;
+   char **                                errors;
 };
 
 
diff --git a/lib/libldapschema/lldap.c b/lib/libldapschema/lldap.c
index edefb71..26e2bbe 100644
--- a/lib/libldapschema/lldap.c
+++ b/lib/libldapschema/lldap.c
@@ -87,8 +87,6 @@ int ldapschema_fetch(LDAPSchema * lsd, LDAP * ld)
    if ((lsd->schema_errs))
       ldapschema_value_free(lsd->schema_errs);
    lsd->schema_errs     = NULL;
-   lsd->schema_errs_cnt = 0;
-   lsd->schema_errs_cur = NULL;
 
    attrs = NULL;
    if ((err = ldapschema_definition_split(lsd, NULL, "( + * )", 7, &attrs)) == -1)
@@ -195,7 +193,7 @@ int ldapschema_fetch(LDAPSchema * lsd, LDAP * ld)
             continue;
          if ((alias = ldapschema_find_alias(lsd, attr->sup_name, lsd->attrs, lsd->attrs_len)) == NULL)
          {
-            ldapschema_schema_err(lsd, &attr->model, "specified invalid superior '%s'", attr->sup_name);
+            ldapschema_schema_err(lsd, &attr->model, "specifies invalid superior '%s'", attr->sup_name);
             continue;
          };
 
@@ -250,7 +248,7 @@ int ldapschema_fetch(LDAPSchema * lsd, LDAP * ld)
             continue;
          if ((alias = ldapschema_find_alias(lsd, objcls->sup_name, lsd->objclses, lsd->objclses_len)) == NULL)
          {
-            ldapschema_schema_err(lsd, &objcls->model, "specified invalid superior '%s'", objcls->sup_name);
+            ldapschema_schema_err(lsd, &objcls->model, "specifies invalid superior '%s'", objcls->sup_name);
             continue;
          };
 
diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index fa6439f..e761f7b 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -1172,7 +1172,7 @@ int ldapschema_parse_objectclass_attrs(LDAPSchema * lsd, const char * field,
    {
       if ((alias = ldapschema_find_alias(lsd, attrnames[idx], lsd->attrs, lsd->attrs_len)) == NULL)
       {
-         ldapschema_schema_err(lsd,  &objcls->model, "'%s' contains invalid attributeType '%s'", field, attrnames[idx]);
+         ldapschema_schema_err(lsd,  &objcls->model, "specifies undefined attributeType '%s' in '%s'", attrnames[idx], field);
          lsd->errcode = LDAPSCHEMA_SCHEMA_ERROR;
       } else
       {
@@ -1182,13 +1182,13 @@ int ldapschema_parse_objectclass_attrs(LDAPSchema * lsd, const char * field,
             return(lsd->errcode);
          };
          if (err == -1)
-            ldapschema_schema_err(lsd, &objcls->model, "'%s' contains duplicate attributeType '%s'", field, attrnames[idx]);
+            ldapschema_schema_err(lsd, &objcls->model, "specifies duplicate attributeType '%s'in '%s'", attrnames[idx], field);
       };
       if ((idx+1) < attrnames_len)
       {
          idx++;
          if ((strcasecmp("$", attrnames[idx])))
-            ldapschema_schema_err(lsd,  &objcls->model, "'%s' contains invalid delimiter", field);
+            ldapschema_schema_err(lsd,  &objcls->model, "uses invalid delimiter in '%s'", field);
       };
    };
 
diff --git a/lib/libldapschema/lmemory.c b/lib/libldapschema/lmemory.c
index 346c321..3818927 100644
--- a/lib/libldapschema/lmemory.c
+++ b/lib/libldapschema/lmemory.c
@@ -202,6 +202,11 @@ void ldapschema_free(LDAPSchema * lsd)
 
    assert(lsd != NULL);
 
+   // frees list of errors
+   if ((lsd->objerrs))
+      free(lsd->objerrs);
+   lsd->objerrs = NULL;
+
    // frees syntaxes list
    if ((lsd->syntaxes))
    {
@@ -576,7 +581,7 @@ int ldapschema_model_register(LDAPSchema * lsd, LDAPSchemaModel * mod)
       return(err);
    if (err == -1)
    {
-      ldapschema_schema_err(lsd, mod, "server defines duplicate OID '%s'", mod->oid);
+      ldapschema_schema_err(lsd, mod, "duplicates OID of existing object");
       if ((err = ldapschema_append(lsd,(void ***)&lsd->dups, &lsd->dups_len, mod)) != LDAP_SUCCESS)
          return(err);
    };
@@ -593,7 +598,7 @@ int ldapschema_model_register(LDAPSchema * lsd, LDAPSchemaModel * mod)
    };
    if (err == -1)
    {
-      ldapschema_schema_err(lsd,  mod, " model with duplicate oid '%s' found", mod->oid);
+      ldapschema_schema_err(lsd,  mod, "duplicates oid of existing object");
       free(alias);
    };
 
@@ -611,7 +616,7 @@ int ldapschema_model_register(LDAPSchema * lsd, LDAPSchemaModel * mod)
       };
       if (err == -1)
       {
-         ldapschema_schema_err(lsd,  mod, " model with duplicate desc '%s' found", mod->oid);
+         ldapschema_schema_err(lsd,  mod, "duplicates DESC of existing object");
          free(alias);
       };
    };
@@ -630,7 +635,7 @@ int ldapschema_model_register(LDAPSchema * lsd, LDAPSchemaModel * mod)
       };
       if (err == -1)
       {
-         ldapschema_schema_err(lsd,  mod, " object with duplicate name '%s' found", names[idx]);
+         ldapschema_schema_err(lsd,  mod, "duplicates NAME '%s' of existing object", names[idx]);
          free(alias);
       };
    };
@@ -641,7 +646,7 @@ int ldapschema_model_register(LDAPSchema * lsd, LDAPSchemaModel * mod)
 
 void ldapschema_object_free(LDAPSchemaModel * obj)
 {
-   size_t ext;
+   size_t idx;
 
    assert(obj != NULL);
 
@@ -656,17 +661,24 @@ void ldapschema_object_free(LDAPSchemaModel * obj)
 
    if ((obj->extensions))
    {
-      for(ext = 0; ((obj->extensions[ext])); ext++)
+      for(idx = 0; ((obj->extensions[idx])); idx++)
       {
-         if ((obj->extensions[ext]->extension))
-            free(obj->extensions[ext]->extension);
-         if ((obj->extensions[ext]->values))
-            ldapschema_value_free(obj->extensions[ext]->values);
-         free(obj->extensions[ext]);
+         if ((obj->extensions[idx]->extension))
+            free(obj->extensions[idx]->extension);
+         if ((obj->extensions[idx]->values))
+            ldapschema_value_free(obj->extensions[idx]->values);
+         free(obj->extensions[idx]);
       };
       free(obj->extensions);
    };
 
+   if ((obj->errors))
+   {
+      for(idx = 0; ((obj->errors[idx])); idx++)
+         free(obj->errors[idx]);
+      free(obj->errors);
+   };
+
    return;
 }