ident.c: add support for IPv6

diff --git a/object.c b/object.c
index df86bdd5a5e944f673fc4bddb6383476c9b0e8ae..980ac5fcdfa7654667c9902aa56407f1ce7053ba 100644 (file)
--- a/object.c
+++ b/object.c
@@ -41,7 +41,8 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)
                len = strlen(str);
 
        for (i = 1; i < ARRAY_SIZE(object_type_strings); i++)
-               if (!strncmp(str, object_type_strings[i], len))
+               if (!strncmp(str, object_type_strings[i], len) &&
+                   object_type_strings[i][len] == '\0')
                        return i;
 
        if (gentle)
@@ -341,12 +342,7 @@ void add_object_array_with_path(struct object *obj, const char *name,
 
 void add_object_array(struct object *obj, const char *name, struct object_array *array)
 {
-       add_object_array_with_mode(obj, name, array, S_IFINVALID);
-}
-
-void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode)
-{
-       add_object_array_with_path(obj, name, array, mode, NULL);
+       add_object_array_with_path(obj, name, array, S_IFINVALID, NULL);
 }
 
 /*