Force off bit Z.

git-svn-id: file:///svn/unbound/trunk@2126 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 2acefd24de590b645738299badfc231e89dda121..5486f13dc6db07ca9aa6056fe01aa33821ff04e2 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 June 2010: Wouter
+       - Ignore Z flag in incoming messages too.
+
 31 May 2010: Wouter
        - Fix AD flag handling, it could in some cases mistakenly copy the AD 
          flag from upstream servers.

diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 2a5e5c9a486018ffca4d1c2c82ee69316bf1bc59..607d0a0d7c2d9e8890bf56919c4c1636fddbcd55 100644 (file)
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -717,7 +717,7 @@ scrub_message(ldns_buffer* pkt, struct msg_parse* msg,
                return 0;
        if( !(msg->flags&BIT_QR) )
                return 0;
-       msg->flags &= ~(BIT_AD); /* force AD bit to be turned off */
+       msg->flags &= ~(BIT_AD|BIT_Z); /* force off bit AD and Z */
        
        /* make sure that a query is echoed back when NOERROR or NXDOMAIN */
        /* this is not required for basic operation but is a forgery