Remove dnsmasq patches

[people/pmueller/ipfire-2.x.git] / src / patches / dnsmasq / 0062-Return-SERVFAIL-when-validation-abandoned.patch

diff --git a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch b/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch
deleted file mode 100644 (file)
index ed4068e..0000000
--- a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 150162bc37170a6edae9d488435e836b1e4e3a4e Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Fri, 27 Mar 2015 09:58:26 +0000
-Subject: [PATCH 062/113] Return SERVFAIL when validation abandoned.
-
----
- src/forward.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/forward.c b/src/forward.c
-index 7c0fa8da3fdf..985814c3aec5 100644
---- a/src/forward.c
-+++ b/src/forward.c
-@@ -663,6 +663,7 @@ static size_t process_reply(struct dns_header *header, time_t now, struct server
-       header->ancount = htons(0);
-       header->nscount = htons(0);
-       header->arcount = htons(0);
-+      header->hb3 &= ~HB3_TC;
-     }
-   
-   /* the bogus-nxdomain stuff, doctor and NXDOMAIN->NODATA munging can all elide
-@@ -991,7 +992,10 @@ void reply_query(int fd, int family, time_t now)
-             char *result;
-             
-             if (forward->work_counter == 0)
--              result = "ABANDONED";
-+              {
-+                result = "ABANDONED";
-+                status = STAT_BOGUS;
-+              }
-             else
-               result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS"));
-             
-@@ -1938,7 +1942,10 @@ unsigned char *tcp_request(int confd, time_t now,
-                         char *result;
- 
-                         if (keycount == 0)
--                          result = "ABANDONED";
-+                          {
-+                            result = "ABANDONED";
-+                            status = STAT_BOGUS;
-+                          }
-                         else
-                           result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS"));
-                         
--- 
-2.1.0
-