X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_lookup.c;h=e6e0a180f9853448d9ea91d0916531fe03d46189;hb=6af8978bd0a03f024aba517495aa32c89de71e5c;hp=8bdb40e63c41f9ff8bd487390663614ede8082d2;hpb=fcd4fcb0afee7df6ff0e9f305f9ef43445f88545;p=sysdb.git diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c index 8bdb40e..e6e0a18 100644 --- a/src/core/store_lookup.c +++ b/src/core/store_lookup.c @@ -76,19 +76,8 @@ lookup_iter(sdb_store_base_t *obj, void *user_data) */ static int -match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj); -static int -match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj); -static int -match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj); - -/* specific matchers */ - -static int -match_obj_name(name_matcher_t *m, const char *name) +match_string(string_matcher_t *m, const char *name) { - assert(m); - if ((! m->name) && (! m->name_re)) return 1; @@ -101,118 +90,34 @@ match_obj_name(name_matcher_t *m, const char *name) /* matches */ 0, NULL, /* flags = */ 0)) return 0; return 1; -} /* match_obj_name */ +} /* match_string */ -static char * -obj_name_tostring(name_matcher_t *m, char *buf, size_t buflen) +static int +match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj) { - snprintf(buf, buflen, "{ %s%s%s, %p }", - m->name ? "'" : "", m->name ? m->name : "NULL", m->name ? "'" : "", - m->name_re); - return buf; -} /* obj_name_tostring */ + int status; -static char * -logical_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) -{ - char left[buflen + 1], right[buflen + 1]; + assert((m->type == MATCHER_AND) || (m->type == MATCHER_OR)); + assert(OP_M(m)->left && OP_M(m)->right); - if (! m) { - /* this should not happen */ - snprintf(buf, buflen, "()"); - return buf; - } + status = sdb_store_matcher_matches(OP_M(m)->left, obj); + /* lazy evaluation */ + if ((! status) && (m->type == MATCHER_AND)) + return status; + else if (status && (m->type == MATCHER_OR)) + return status; - assert((m->type == MATCHER_OR) || (m->type == MATCHER_AND)); - snprintf(buf, buflen, "(%s, %s, %s)", - m->type == MATCHER_OR ? "OR" : "AND", - sdb_store_matcher_tostring(OP_M(m)->left, left, sizeof(left)), - sdb_store_matcher_tostring(OP_M(m)->right, right, sizeof(right))); - return buf; -} /* logical_tostring */ + return sdb_store_matcher_matches(OP_M(m)->right, obj); +} /* match_logical */ -static char * -unary_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) +static int +match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj) { - char op[buflen + 1]; - - if (! m) { - /* this should not happen */ - snprintf(buf, buflen, "()"); - return buf; - } - assert(m->type == MATCHER_NOT); - snprintf(buf, buflen, "(NOT, %s)", - sdb_store_matcher_tostring(UOP_M(m)->op, op, sizeof(op))); - return buf; -} /* unary_tostring */ - -static char * -name_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) -{ - char name[buflen + 1]; - assert(m->type == MATCHER_NAME); - snprintf(buf, buflen, "OBJ[%s]{ NAME%s }", - SDB_STORE_TYPE_TO_NAME(OBJ_M(m)->obj_type), - obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name))); - return buf; -} /* name_tostring */ - -static char * -attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) -{ - char name[buflen + 1], value[buflen + 1]; - - if (! m) { - snprintf(buf, buflen, "ATTR{}"); - return buf; - } - - assert(m->type == MATCHER_ATTR); - snprintf(buf, buflen, "ATTR{ NAME%s, VALUE%s }", - obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)), - obj_name_tostring(&ATTR_M(m)->value, value, sizeof(value))); - return buf; -} /* attr_tostring */ - -static char * -service_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) -{ - char name[buflen + 1], attr[buflen + 1]; - - if (! m) { - snprintf(buf, buflen, "SERVICE{}"); - return buf; - } - - assert(m->type == MATCHER_SERVICE); - snprintf(buf, buflen, "SERVICE{ NAME%s, %s }", - obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)), - attr_tostring(SDB_STORE_MATCHER(SERVICE_M(m)->attr), - attr, sizeof(attr))); - return buf; -} /* service_tostring */ - -static char * -host_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) -{ - char name[buflen + 1], service[buflen + 1], attr[buflen + 1]; - - if (! m) { - snprintf(buf, buflen, "HOST{}"); - return buf; - } + assert(UOP_M(m)->op); - assert(m->type == MATCHER_HOST); - snprintf(buf, buflen, "HOST{ NAME%s, %s, %s }", - obj_name_tostring(&OBJ_M(m)->name, name, sizeof(name)), - service_tostring(SDB_STORE_MATCHER(HOST_M(m)->service), - service, sizeof(service)), - attr_tostring(SDB_STORE_MATCHER(HOST_M(m)->attr), - attr, sizeof(attr))); - return buf; -} /* host_tostring */ + return !sdb_store_matcher_matches(UOP_M(m)->op, obj); +} /* match_unary */ static int match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj) @@ -220,14 +125,11 @@ match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj) sdb_llist_iter_t *iter = NULL; int status = 0; - assert(m && obj); - - if (obj->type != SDB_HOST) - return 0; + assert(m->type == MATCHER_NAME); - switch (OBJ_M(m)->obj_type) { + switch (NAME_M(m)->obj_type) { case SDB_HOST: - return match_obj_name(&OBJ_M(m)->name, obj->super.name); + return match_string(&NAME_M(m)->name, obj->super.name); break; case SDB_SERVICE: iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children); @@ -239,7 +141,7 @@ match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj) while (sdb_llist_iter_has_next(iter)) { sdb_store_base_t *child = STORE_BASE(sdb_llist_iter_get_next(iter)); - if (match_obj_name(&OBJ_M(m)->name, child->super.name)) { + if (match_string(&NAME_M(m)->name, child->super.name)) { status = 1; break; } @@ -248,107 +150,32 @@ match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj) return status; } /* match_name */ -/* match attribute specific values; - * always call this function through match_obj() */ -static int -match_attr(attr_matcher_t *m, sdb_store_base_t *obj) -{ - assert(m && obj); - - if (obj->type != SDB_ATTRIBUTE) - return 0; - - { - sdb_attribute_t *attr = SDB_ATTR(obj); - char buf[sdb_data_strlen(&attr->value) + 1]; - - if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0) - return 0; - return match_obj_name(&m->value, buf); - } -} /* match_attr */ - -/* match service specific values; - * always call this function through match_obj() */ static int -match_service(service_matcher_t *m, sdb_store_base_t *obj) +match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj) { - sdb_llist_iter_t *iter; - - assert(m && obj); - - if (obj->type != SDB_SERVICE) - return 0; + sdb_llist_iter_t *iter = NULL; + int status = 0; - if (! m->attr) - return 1; + assert(m->type == MATCHER_ATTR); iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes); while (sdb_llist_iter_has_next(iter)) { - sdb_store_base_t *attr = STORE_BASE(sdb_llist_iter_get_next(iter)); - - /* if any of the attributes matches we found a matching service */ - if (match_obj(M(m->attr), attr)) { - sdb_llist_iter_destroy(iter); - return 1; - } - } - sdb_llist_iter_destroy(iter); - return 0; -} /* match_service */ - -/* match host specific values; - * always call this function through match_obj() */ -static int -match_host(host_matcher_t *m, sdb_store_base_t *obj) -{ - sdb_llist_iter_t *iter; - int status; - - assert(m && obj); - - if (obj->type != SDB_HOST) - return 0; + sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(iter)); + char buf[sdb_data_strlen(&attr->value) + 1]; - if (m->service) { - iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->children); - status = 0; - } - else { - iter = NULL; - status = 1; - } - while (sdb_llist_iter_has_next(iter)) { - sdb_store_base_t *service = STORE_BASE(sdb_llist_iter_get_next(iter)); + if (ATTR_M(m)->name && strcasecmp(ATTR_M(m)->name, SDB_OBJ(attr)->name)) + continue; - /* found a matching service */ - if (match_obj(M(m->service), service)) { + if (sdb_data_format(&attr->value, buf, sizeof(buf), SDB_UNQUOTED) <= 0) + return 0; + if (match_string(&ATTR_M(m)->value, buf)) { status = 1; break; } } sdb_llist_iter_destroy(iter); - - if (! status) - return status; - else if (! m->attr) - return 1; - - iter = sdb_llist_get_iter(SDB_STORE_OBJ(obj)->attributes); - while (sdb_llist_iter_has_next(iter)) { - sdb_store_base_t *attr = STORE_BASE(sdb_llist_iter_get_next(iter)); - - /* if any attribute matches, we found a matching host */ - if (match_obj(M(m->attr), attr)) { - sdb_llist_iter_destroy(iter); - return 1; - } - } - sdb_llist_iter_destroy(iter); - return 0; -} /* match_host */ - -/* generic matchers */ + return status; +} /* match_attr */ typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_base_t *); @@ -359,85 +186,16 @@ static matcher_cb matchers[] = { match_logical, match_unary, match_name, - match_obj, - match_obj, - match_obj, + match_attr, }; -typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t); - -static matcher_tostring_cb matchers_tostring[] = { - logical_tostring, - logical_tostring, - unary_tostring, - name_tostring, - attr_tostring, - service_tostring, - host_tostring, -}; - -static int -match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj) -{ - int status; - - assert(m && obj); - assert(OP_M(m)->left && OP_M(m)->right); - - status = sdb_store_matcher_matches(OP_M(m)->left, obj); - /* lazy evaluation */ - if ((! status) && (m->type == MATCHER_AND)) - return status; - else if (status && (m->type == MATCHER_OR)) - return status; - - return sdb_store_matcher_matches(OP_M(m)->right, obj); -} /* match_logical */ - -static int -match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj) -{ - assert(m && obj); - assert(UOP_M(m)->op); - - return !sdb_store_matcher_matches(UOP_M(m)->op, obj); -} /* match_unary */ - -static int -match_obj(sdb_store_matcher_t *m, sdb_store_base_t *obj) -{ - int status; - - assert(m && obj); - - status = match_obj_name(&OBJ_M(m)->name, obj->super.name); - if (! status) - return status; - - switch (m->type) { - case MATCHER_ATTR: - return match_attr(ATTR_M(m), obj); - break; - case MATCHER_SERVICE: - return match_service(SERVICE_M(m), obj); - break; - case MATCHER_HOST: - return match_host(HOST_M(m), obj); - break; - default: - assert(m->type != m->type); - break; - } - return 0; -} /* match_obj */ - /* * private matcher types */ -/* initializes a name matcher consuming two elements from ap */ +/* initializes a string matcher consuming two elements from ap */ static int -name_matcher_init(name_matcher_t *m, va_list ap) +string_matcher_init(string_matcher_t *m, va_list ap) { const char *name = va_arg(ap, const char *); const char *name_re = va_arg(ap, const char *); @@ -455,10 +213,10 @@ name_matcher_init(name_matcher_t *m, va_list ap) return -1; } return 0; -} /* name_matcher_init */ +} /* string_matcher_init */ static void -name_matcher_destroy(name_matcher_t *m) +string_matcher_destroy(string_matcher_t *m) { if (m->name) free(m->name); @@ -466,103 +224,84 @@ name_matcher_destroy(name_matcher_t *m) regfree(m->name_re); free(m->name_re); } -} /* name_matcher_destroy */ +} /* string_matcher_destroy */ -/* initializes an object matcher consuming two elements from ap */ +static char * +string_tostring(string_matcher_t *m, char *buf, size_t buflen) +{ + snprintf(buf, buflen, "{ %s%s%s, %p }", + m->name ? "'" : "", m->name ? m->name : "NULL", m->name ? "'" : "", + m->name_re); + return buf; +} /* string_tostring */ + +/* initializes a name matcher */ static int -obj_matcher_init(sdb_object_t *obj, va_list ap) +name_matcher_init(sdb_object_t *obj, va_list ap) { - obj_matcher_t *m = OBJ_M(obj); + name_matcher_t *m = NAME_M(obj); M(obj)->type = MATCHER_NAME; - return name_matcher_init(&m->name, ap); -} /* obj_matcher_init */ + return string_matcher_init(&m->name, ap); +} /* name_matcher_init */ static void -obj_matcher_destroy(sdb_object_t *obj) +name_matcher_destroy(sdb_object_t *obj) +{ + name_matcher_t *m = NAME_M(obj); + string_matcher_destroy(&m->name); +} /* name_matcher_destroy */ + +static char * +name_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) { - obj_matcher_t *m = OBJ_M(obj); - name_matcher_destroy(&m->name); -} /* obj_matcher_destroy */ + char name[buflen + 1]; + assert(m->type == MATCHER_NAME); + snprintf(buf, buflen, "OBJ[%s]{ NAME%s }", + SDB_STORE_TYPE_TO_NAME(NAME_M(m)->obj_type), + string_tostring(&NAME_M(m)->name, name, sizeof(name))); + return buf; +} /* name_tostring */ static int attr_matcher_init(sdb_object_t *obj, va_list ap) { attr_matcher_t *attr = ATTR_M(obj); - int status; - - status = obj_matcher_init(obj, ap); - if (! status) - status = name_matcher_init(&attr->value, ap); + const char *name = va_arg(ap, const char *); M(obj)->type = MATCHER_ATTR; - return status; + if (name) { + attr->name = strdup(name); + if (! attr->name) + return -1; + } + return string_matcher_init(&attr->value, ap); } /* attr_matcher_init */ static void attr_matcher_destroy(sdb_object_t *obj) { attr_matcher_t *attr = ATTR_M(obj); - - obj_matcher_destroy(obj); - name_matcher_destroy(&attr->value); + if (attr->name) + free(attr->name); + attr->name = NULL; + string_matcher_destroy(&attr->value); } /* attr_matcher_destroy */ -static int -service_matcher_init(sdb_object_t *obj, va_list ap) -{ - attr_matcher_t *attr; - int status; - - status = obj_matcher_init(obj, ap); - if (status) - return status; - - attr = va_arg(ap, attr_matcher_t *); - - sdb_object_ref(SDB_OBJ(attr)); - SERVICE_M(obj)->attr = attr; - - M(obj)->type = MATCHER_SERVICE; - return 0; -} /* service_matcher_init */ - -static void -service_matcher_destroy(sdb_object_t *obj) -{ - obj_matcher_destroy(obj); - sdb_object_deref(SDB_OBJ(SERVICE_M(obj)->attr)); -} /* service_matcher_destroy */ - -static int -host_matcher_init(sdb_object_t *obj, va_list ap) +static char * +attr_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) { - service_matcher_t *service; - attr_matcher_t *attr; - int status; - - status = obj_matcher_init(obj, ap); - if (status) - return status; + char value[buflen + 1]; - service = va_arg(ap, service_matcher_t *); - attr = va_arg(ap, attr_matcher_t *); - - sdb_object_ref(SDB_OBJ(service)); - HOST_M(obj)->service = service; - sdb_object_ref(SDB_OBJ(attr)); - HOST_M(obj)->attr = attr; - - M(obj)->type = MATCHER_HOST; - return 0; -} /* host_matcher_init */ + if (! m) { + snprintf(buf, buflen, "ATTR{}"); + return buf; + } -static void -host_matcher_destroy(sdb_object_t *obj) -{ - obj_matcher_destroy(obj); - sdb_object_deref(SDB_OBJ(HOST_M(obj)->service)); - sdb_object_deref(SDB_OBJ(HOST_M(obj)->attr)); -} /* host_matcher_destroy */ + assert(m->type == MATCHER_ATTR); + snprintf(buf, buflen, "ATTR[%s]{ VALUE%s }", ATTR_M(m)->name, + string_tostring(&ATTR_M(m)->value, value, sizeof(value))); + return buf; +} /* attr_tostring */ static int op_matcher_init(sdb_object_t *obj, va_list ap) @@ -590,6 +329,25 @@ op_matcher_destroy(sdb_object_t *obj) sdb_object_deref(SDB_OBJ(OP_M(obj)->right)); } /* op_matcher_destroy */ +static char * +op_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) +{ + char left[buflen + 1], right[buflen + 1]; + + if (! m) { + /* this should not happen */ + snprintf(buf, buflen, "()"); + return buf; + } + + assert((m->type == MATCHER_OR) || (m->type == MATCHER_AND)); + snprintf(buf, buflen, "(%s, %s, %s)", + m->type == MATCHER_OR ? "OR" : "AND", + sdb_store_matcher_tostring(OP_M(m)->left, left, sizeof(left)), + sdb_store_matcher_tostring(OP_M(m)->right, right, sizeof(right))); + return buf; +} /* op_tostring */ + static int uop_matcher_init(sdb_object_t *obj, va_list ap) { @@ -612,10 +370,27 @@ uop_matcher_destroy(sdb_object_t *obj) sdb_object_deref(SDB_OBJ(UOP_M(obj)->op)); } /* uop_matcher_destroy */ +static char * +uop_tostring(sdb_store_matcher_t *m, char *buf, size_t buflen) +{ + char op[buflen + 1]; + + if (! m) { + /* this should not happen */ + snprintf(buf, buflen, "()"); + return buf; + } + + assert(m->type == MATCHER_NOT); + snprintf(buf, buflen, "(NOT, %s)", + sdb_store_matcher_tostring(UOP_M(m)->op, op, sizeof(op))); + return buf; +} /* uop_tostring */ + static sdb_type_t name_type = { - /* size = */ sizeof(obj_matcher_t), - /* init = */ obj_matcher_init, - /* destroy = */ obj_matcher_destroy, + /* size = */ sizeof(name_matcher_t), + /* init = */ name_matcher_init, + /* destroy = */ name_matcher_destroy, }; static sdb_type_t attr_type = { @@ -624,18 +399,6 @@ static sdb_type_t attr_type = { /* destroy = */ attr_matcher_destroy, }; -static sdb_type_t service_type = { - /* size = */ sizeof(service_matcher_t), - /* init = */ service_matcher_init, - /* destroy = */ service_matcher_destroy, -}; - -static sdb_type_t host_type = { - /* size = */ sizeof(host_matcher_t), - /* init = */ host_matcher_init, - /* destroy = */ host_matcher_destroy, -}; - static sdb_type_t op_type = { /* size = */ sizeof(op_matcher_t), /* init = */ op_matcher_init, @@ -648,6 +411,18 @@ static sdb_type_t uop_type = { /* destroy = */ uop_matcher_destroy, }; +typedef char *(*matcher_tostring_cb)(sdb_store_matcher_t *, char *, size_t); + +/* this array needs to be indexable by the matcher types; + * -> update the enum in store-private.h when updating this */ +static matcher_tostring_cb matchers_tostring[] = { + op_tostring, + op_tostring, + uop_tostring, + name_tostring, + attr_tostring, +}; + /* * public API */ @@ -667,103 +442,62 @@ sdb_store_name_matcher(int type, const char *name, _Bool re) if (! m) return NULL; - OBJ_M(m)->obj_type = type; + NAME_M(m)->obj_type = type; return m; } /* sdb_store_name_matcher */ sdb_store_matcher_t * -sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re, - const char *attr_value, const char *attr_value_re) +sdb_store_attr_matcher(const char *name, const char *value, _Bool re) { + if (re) + return M(sdb_object_create("attr-matcher", attr_type, + name, NULL, value)); return M(sdb_object_create("attr-matcher", attr_type, - attr_name, attr_name_re, attr_value, attr_value_re)); + name, value, NULL)); } /* sdb_store_attr_matcher */ -sdb_store_matcher_t * -sdb_store_service_matcher(const char *service_name, const char *service_name_re, - sdb_store_matcher_t *attr_matcher) -{ - return M(sdb_object_create("service-matcher", service_type, - service_name, service_name_re, attr_matcher)); -} /* sdb_store_service_matcher */ - -sdb_store_matcher_t * -sdb_store_host_matcher(const char *host_name, const char *host_name_re, - sdb_store_matcher_t *service_matcher, - sdb_store_matcher_t *attr_matcher) -{ - return M(sdb_object_create("host-matcher", host_type, - host_name, host_name_re, service_matcher, attr_matcher)); -} /* sdb_store_host_matcher */ - sdb_store_matcher_t * sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr, const char *op, const char *value) { - int typ = -1; - int inv = 0; + int type = -1; + _Bool inv = 0; + _Bool re = 0; sdb_store_matcher_t *m = NULL; - const char *matcher = NULL; - const char *matcher_re = NULL; - if (! strcasecmp(obj_type, "host")) - typ = SDB_HOST; + type = SDB_HOST; else if (! strcasecmp(obj_type, "service")) - typ = SDB_SERVICE; + type = SDB_SERVICE; else if (! strcasecmp(obj_type, "attribute")) - typ = SDB_ATTRIBUTE; + type = SDB_ATTRIBUTE; /* TODO: support other operators */ if (! strcasecmp(op, "=")) { - matcher = value; + /* nothing to do */ } else if (! strcasecmp(op, "!=")) { - matcher = value; inv = 1; } else if (! strcasecmp(op, "=~")) { - matcher_re = value; + re = 1; } else if (! strcasecmp(op, "!~")) { - matcher_re = value; inv = 1; + re = 1; } else return NULL; - if (! strcasecmp(attr, "name")) { - /* accept */ - } - else if (typ == SDB_ATTRIBUTE) - m = sdb_store_host_matcher(/* name = */ NULL, NULL, - /* service = */ NULL, - sdb_store_attr_matcher(attr, NULL, matcher, matcher_re)); - else - return NULL; - - if (m) { - /* accept the attribute value matcher */ - } - else if (typ == SDB_HOST) - m = sdb_store_host_matcher(matcher, matcher_re, NULL, NULL); - else if (typ == SDB_SERVICE) - m = sdb_store_host_matcher(/* name = */ NULL, NULL, - sdb_store_service_matcher(matcher, matcher_re, NULL), - /* attr = */ NULL); - else if (typ == SDB_ATTRIBUTE) - m = sdb_store_host_matcher(/* name = */ NULL, NULL, - /* service = */ NULL, - sdb_store_attr_matcher(matcher, matcher_re, NULL, NULL)); + if (! strcasecmp(attr, "name")) + m = sdb_store_name_matcher(type, value, re); + else if (type == SDB_ATTRIBUTE) + m = sdb_store_attr_matcher(attr, value, re); if (! m) return NULL; - /* pass ownership to the host matcher */ - sdb_object_deref(SDB_OBJ(HOST_M(m)->service)); - sdb_object_deref(SDB_OBJ(HOST_M(m)->attr)); - if (inv) { sdb_store_matcher_t *tmp; tmp = sdb_store_inv_matcher(m); @@ -797,6 +531,9 @@ sdb_store_inv_matcher(sdb_store_matcher_t *m) int sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_base_t *obj) { + if (obj->type != SDB_HOST) + return 0; + /* "NULL" always matches */ if ((! m) || (! obj)) return 1;