Re-enable EDNS if an EDNS flag gets set to 1 by +ednsflags

This is consistent with +dnssec and +nsid which only re-enable
EDNS if do is set to 1 or nsid is requested.

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 291490b741748e6590ca4b336ea3bf74f712311d..c98fa882775d5f8a99a824c74786da9363802f81 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1797,6 +1797,10 @@ plus_option(char *option, bool is_batchfile, bool *need_clone,
                                                             "ednsflags");
                                                        goto exit_or_usage;
                                                }
+                                               if (lookup->edns == -1) {
+                                                       lookup->edns =
+                                                               DEFAULT_EDNS_VERSION;
+                                               }
                                                lookup->ednsflags = num;
                                                break;
                                        case 'n':

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index c1ac42978eb652471519ce4c442b1ce593ab93fc..0270edb31b5a8eaf9d24f8e9b13580abafb4c533 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1354,6 +1354,9 @@ plus_option(char *option, struct query *query, bool global) {
                                                        "ednsflags");
                                                CHECK("parse_xint(ednsflags)",
                                                      result);
+                                               if (query->edns == -1) {
+                                                       query->edns = 1;
+                                               }
                                                query->ednsflags = num;
                                                break;
                                        case 'o':