- Fix remove private address does not throw away entire response.

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

diff --git a/doc/Changelog b/doc/Changelog
index e2fc884a6fe776f57c068ee7122bdca1d2b6be2f..1a58475780a52c07e641fc2e41927ab404692724 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+28 January 2011: Wouter
+       - Fix remove private address does not throw away entire response.
+
+24 January 2011: Wouter
+       - release 1.4.8
+
 19 January 2011: Wouter
        - fix bug#349: no -L/usr for ldns.
 

diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 607d0a0d7c2d9e8890bf56919c4c1636fddbcd55..af4192267ae93d64c99e619d246cc861443c7148 100644 (file)
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -643,9 +643,9 @@ scrub_sanitize(ldns_buffer* pkt, struct msg_parse* msg,
                if( (rrset->type == LDNS_RR_TYPE_A || 
                        rrset->type == LDNS_RR_TYPE_AAAA) &&
                        priv_rrset_bad(ie->priv, pkt, rrset)) {
-                       /* set servfail, so the classification becomes
-                        * THROWAWAY, instead of LAME or other unwanted */
-                       FLAGS_SET_RCODE(msg->flags, LDNS_RCODE_SERVFAIL);
+
+                       /* do not set servfail since this leads to too
+                        * many drops of other people using rfc1918 space */
                        remove_rrset("sanitize: removing public name with "
                                "private address", pkt, msg, prev, &rrset);
                        continue;