From: Margaret Wasserman <mrw@painless-security.com>
Date: Fri, 14 Mar 2014 13:41:22 +0000 (-0400)
Subject: Remove API dependency on jansson for constraints.
X-Git-Tag: 1.3.1~46
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=81fd98066cc0aa8f923e107ed6d5e8cdfa869ded;hp=83bbfd900aa88e30e3bfa220cc7b13328debb72f;p=trust_router.git

Remove API dependency on jansson for constraints.
---

diff --git a/common/tr_constraint.c b/common/tr_constraint.c
index aa3d4fc..3ce6cbe 100644
--- a/common/tr_constraint.c
+++ b/common/tr_constraint.c
@@ -44,9 +44,9 @@ TR_CONSTRAINT_SET *tr_constraint_set_from_fline (TR_FLINE *fline)
     return NULL;
 
   if (fline->realm_cons)
-    tr_constraint_add_to_set(&cset, fline->realm_cons);
+    tr_constraint_add_to_set((TR_CONSTRAINT_SET **)&cset, fline->realm_cons);
   if (fline->domain_cons)
-    tr_constraint_add_to_set(&cset, fline->domain_cons);
+    tr_constraint_add_to_set((TR_CONSTRAINT_SET **)&cset, fline->domain_cons);
   
    return cset;
 }
diff --git a/include/trust_router/tr_constraint.h b/include/trust_router/tr_constraint.h
index d740a3a..deeed51 100644
--- a/include/trust_router/tr_constraint.h
+++ b/include/trust_router/tr_constraint.h
@@ -36,12 +36,11 @@
 #define TR_CONSTRAINT_H
 
 #include <trust_router/tr_name.h>
-#include <jansson.h>
 
 #define TR_MAX_CONST_MATCHES 24
 
 typedef struct tr_fline TR_FLINE;
-typedef json_t TR_CONSTRAINT_SET;
+typedef void TR_CONSTRAINT_SET;
 
 typedef struct tr_constraint {
   TR_NAME *type;