- Fix #404: DNS query with small edns bufsize fail.

diff --git a/doc/Changelog b/doc/Changelog
index 2edaa330d372ba8a686b7338572e6e59f628f8c3..27e8621c38f3590fe35febdc6801df6704174999 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 January 2021: Wouter
+       - Fix #404: DNS query with small edns bufsize fail.
+
 15 January 2021: Wouter
        - Merge #402 from fobser: Implement IPv4-Embedded addresses according
          to RFC6052.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index b51bcfca5b767c51ea9f3c2ffdf7be92f9571ff8..c1c3eb9b3f168c91782048b9f9c6f636a0413432 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -388,7 +388,7 @@ server:
        # target-fetch-policy: "3 2 1 0 0"
 
        # Harden against very small EDNS buffer sizes.
-       # harden-short-bufsize: no
+       # harden-short-bufsize: yes
 
        # Harden against unseemly large queries.
        # harden-large-queries: no

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index e7964d96931933d0c797628fbbb7db9def737ba1..2fa8e7a95f0b21b77febbaa620f04f71f47ef5ef 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -839,9 +839,8 @@ closer to that of BIND 9, while setting "\-1 \-1 \-1 \-1 \-1" gives behaviour
 rumoured to be closer to that of BIND 8.
 .TP
 .B harden\-short\-bufsize: \fI<yes or no>
-Very small EDNS buffer sizes from queries are ignored. Default is off, since
-it is legal protocol wise to send these, and unbound tries to give very
-small answers to these queries, where possible.
+Very small EDNS buffer sizes from queries are ignored. Default is on, as
+described in the standard.
 .TP
 .B harden\-large\-queries: \fI<yes or no>
 Very large queries are ignored. Default is off, since it is legal protocol

diff --git a/util/config_file.c b/util/config_file.c
index 4c827b74e7e090b7bf2ea9cd7310d1cf93b06e9f..a845dde23479709ff0ade90f03715f5d8d39f7df 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -220,7 +220,7 @@ config_create(void)
        cfg->views = NULL;
        cfg->acls = NULL;
        cfg->tcp_connection_limits = NULL;
-       cfg->harden_short_bufsize = 0;
+       cfg->harden_short_bufsize = 1;
        cfg->harden_large_queries = 0;
        cfg->harden_glue = 1;
        cfg->harden_dnssec_stripped = 1;
@@ -388,6 +388,7 @@ struct config_file* config_create_forlib(void)
        cfg->val_log_level = 2; /* to fill why_bogus with */
        cfg->val_log_squelch = 1;
        cfg->minimal_responses = 0;
+       cfg->harden_short_bufsize = 1;
        return cfg;
 }