From b4eb8b96561ce8d638daad54463a8fa2022dc96c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 31 Aug 2017 13:37:36 +1000
Subject: [PATCH] 4696.   [port]          Enable filter-aaaa support by default
 on Windows                         builds. [RT #45883]

---
 CHANGES              | 3 +++
 win32utils/Configure | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index a123648f3c..9a2ffc0d46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4696.	[port]		Enable filter-aaaa support by default on Windows
+			builds. [RT #45883]
+
 4695.	[bug]		cookie-secrets were not being properly checked by
 			named-checkconf. [RT #45886]
 
diff --git a/win32utils/Configure b/win32utils/Configure
index b6b0ff5f43..b544c3240b 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -620,7 +620,7 @@ my @help = (
 "  enable-native-pkcs11  use native PKCS#11 for all crypto [default=no]\n",
 "  enable-openssl-hash   use OpenSSL for hash functions [default=yes]\n",
 "  enable-isc-spnego     use SPNEGO from lib/dns [default=yes]\n",
-"  enable-filter-aaaa    enable filtering of AAAA records [default=no]\n",
+"  enable-filter-aaaa    enable filtering of AAAA records [default=yes]\n",
 "  enable-fixed-rrset    enable fixed rrset ordering [default=no]\n",
 "  enable-developer      enable developer build settings [default=no]\n",
 "  enable-querytrace     enable very verbose query trace [default=no]\n",
@@ -663,7 +663,7 @@ my $unknown_value;
 my $enable_intrinsics = "yes";
 my $enable_native_pkcs11 = "no";
 my $enable_openssl_hash = "auto";
-my $enable_filter_aaaa = "no";
+my $enable_filter_aaaa = "yes";
 my $enable_isc_spnego = "yes";
 my $enable_fixed_rrset = "no";
 my $enable_developer = "no";
@@ -881,8 +881,8 @@ sub myenable {
             $enable_isc_spnego = "no";
         }
     } elsif ($key =~ /^filter-aaaa$/i) {
-        if ($val =~ /^yes$/i) {
-            $enable_filter_aaaa = "yes";
+        if ($val =~ /^no$/i) {
+            $enable_filter_aaaa = "no";
         }
     } elsif ($key =~ /^fixed-rrset$/i) {
         if ($val =~ /^yes$/i) {