X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=42281883295aebd043032aafa31bfc0b1b2d772a;hb=b1d0d9add668e008f5b59f8ae76d8167b223e056;hp=cda98357cadaa114e0af20f956f9927dc7e9cf49;hpb=fcd4fcb0afee7df6ff0e9f305f9ef43445f88545;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index cda9835..4228188 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -89,8 +89,6 @@ enum {
 	MATCHER_NOT,
 	MATCHER_NAME,
 	MATCHER_ATTR,
-	MATCHER_SERVICE,
-	MATCHER_HOST,
 };
 
 /* match the name of something */
@@ -139,31 +137,14 @@ typedef struct {
 
 /* match attributes */
 typedef struct {
-	obj_matcher_t super;
+	sdb_store_matcher_t super;
+	char *name;
 	/* XXX: this needs to be more flexible;
 	 *      add support for type-specific operators */
 	name_matcher_t value;
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))
 
-/* match services */
-typedef struct {
-	obj_matcher_t super;
-	/* match by attributes assigned to the service */
-	attr_matcher_t *attr;
-} service_matcher_t;
-#define SERVICE_M(m) ((service_matcher_t *)(m))
-
-/* match hosts */
-typedef struct {
-	obj_matcher_t super;
-	/* match by services assigned to the host */
-	service_matcher_t *service;
-	/* match by attributes assigned to the host */
-	attr_matcher_t *attr;
-} host_matcher_t;
-#define HOST_M(m) ((host_matcher_t *)(m))
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif