From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 13 Aug 2015 17:32:19 +0000 (+0200)
Subject: lib: fixed bad merge (failed to copy TA with root hints)
X-Git-Tag: v1.0.0-beta1~53^2~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd7784abc8745ce68a498708e4e00abca36917c9;p=thirdparty%2Fknot-resolver.git

lib: fixed bad merge (failed to copy TA with root hints)
---

diff --git a/lib/zonecut.c b/lib/zonecut.c
index a2e0d58a0..f1427cce6 100644
--- a/lib/zonecut.c
+++ b/lib/zonecut.c
@@ -294,6 +294,9 @@ int kr_zonecut_set_sbelt(struct kr_context *ctx, struct kr_zonecut *cut)
 	/* Copy root hints from resolution context. */
 	if (ctx->root_hints.nsset.root) {
 		int ret = kr_zonecut_copy(cut, &ctx->root_hints);
+		if (ret == 0) {
+			ret = kr_zonecut_copy_trust(cut, &ctx->root_hints);
+		}
 		if (ret == 0) {
 			return ret;
 		}