]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
lib: fixed bad merge (failed to copy TA with root hints)
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 13 Aug 2015 17:32:19 +0000 (19:32 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 13 Aug 2015 17:32:19 +0000 (19:32 +0200)
lib/zonecut.c

index a2e0d58a0aacb1e0c0eaec1bfa85473e1ba9c4c4..f1427cce6ec5f51f738fe57cffbafb6720f05fba 100644 (file)
@@ -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;
                }