diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-02-11 17:25:12 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-02-11 17:25:12 +0000 |
commit | e24c5f9706c7df9bbd9a49f3a6d2dddb9e80b480 (patch) | |
tree | 24d5959c36b8e8d04448929bd95172f5928927d1 /validator | |
parent | a7af7146c91c816cb83e0c5812eca7019531acb5 (diff) | |
download | src-e24c5f9706c7df9bbd9a49f3a6d2dddb9e80b480.tar.gz src-e24c5f9706c7df9bbd9a49f3a6d2dddb9e80b480.zip |
Apply upstream r3619, r3620, r3621: add insecure-lan-zone option
Notes
Notes:
svn path=/vendor/unbound/dist/; revision=295530
Diffstat (limited to 'validator')
-rw-r--r-- | validator/val_anchor.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/validator/val_anchor.c b/validator/val_anchor.c index 845b54a2e85e..bc9f8b8773f9 100644 --- a/validator/val_anchor.c +++ b/validator/val_anchor.c @@ -48,6 +48,7 @@ #include "util/log.h" #include "util/net_help.h" #include "util/config_file.h" +#include "util/as112.h" #include "sldns/sbuffer.h" #include "sldns/rrdef.h" #include "sldns/str2wire.h" @@ -1044,8 +1045,18 @@ int anchors_apply_cfg(struct val_anchors* anchors, struct config_file* cfg) { struct config_strlist* f; + const char** zstr; char* nm; sldns_buffer* parsebuf = sldns_buffer_new(65535); + if(cfg->insecure_lan_zones) { + for(zstr = as112_zones; *zstr; zstr++) { + if(!anchor_insert_insecure(anchors, *zstr)) { + log_err("error in insecure-lan-zones: %s", *zstr); + sldns_buffer_free(parsebuf); + return 0; + } + } + } for(f = cfg->domain_insecure; f; f = f->next) { if(!f->str || f->str[0] == 0) /* empty "" */ continue; |