From: Karel Slany <karel.slany@nic.cz>
Date: Fri, 21 Aug 2015 10:18:59 +0000 (+0200)
Subject: layer/validate: trust anchors are loaded from the configuration file
X-Git-Tag: v1.0.0-beta1~53^2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d100fb1dd4e3476d86b2261ef7bbcadecbab9dd;p=thirdparty%2Fknot-resolver.git

layer/validate: trust anchors are loaded from the configuration file

The hard-wired root trust anchor was removed.
---

diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 904bb08eb..85a5237f5 100644
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -397,7 +397,7 @@ static int validate(knot_layer_t *ctx, knot_pkt_t *pkt)
 			DEBUG_MSG(qry, "Missing trust anchor.\n");
 #warning TODO: the trust anchor must be fetched from a configurable storage
 			if (qry->zone_cut.name[0] == '\0') {
-				kr_ta_parse(&qry->zone_cut.trust_anchor, ROOT_TA, qry->zone_cut.pool);
+				kr_ta_get(&qry->zone_cut.trust_anchor, &global_trust_anchors, ROOT_NAME, qry->zone_cut.pool);
 			}
 		}
 
@@ -550,8 +550,8 @@ int validate_init(struct kr_module *module)
 	if (ret != 0) {
 		return ret;
 	}
-	/* Add root trust anchor. */
-	ret = kr_ta_add(&global_trust_anchors, ROOT_TA);
+//	/* Add root trust anchor. */
+//	ret = kr_ta_add(&global_trust_anchors, ROOT_TA);
 	if (ret != 0) {
 		return ret;
 	}