src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch

   1 From e66b4dff3c562c7836d5be4c26972d665ad783f1 Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Tue, 28 Apr 2015 20:45:57 +0100
   4 Subject: [PATCH 85/87] Fix argument-order botch which broke DNSSEC for TCP
   5  queries.
   6
   7 ---
   8  src/forward.c | 9 +++++----
   9  1 file changed, 5 insertions(+), 4 deletions(-)
  10
  11 diff --git a/src/forward.c b/src/forward.c
  12 index 1c7da3f5655c..a8e403c4b25e 100644
  13 --- a/src/forward.c
  14 +++ b/src/forward.c
  15 @@ -1996,8 +1996,9 @@ unsigned char *tcp_request(int confd, time_t now,
  16                             }
  17                           else
  18                             result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS"));
  19 -                          if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
  20 -                            domain = daemon->namebuff;
  21 +
  22 +                         if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
  23 +                           domain = daemon->namebuff;
  24
  25                           log_query(F_KEYTAG | F_SECSTAT, domain, NULL, result);
  26
  27 @@ -2040,8 +2041,8 @@ unsigned char *tcp_request(int confd, time_t now,
  28  #endif
  29
  30                       m = process_reply(header, now, last_server, (unsigned int)m,
  31 -                                       option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, bogusanswer,
  32 -                                       cache_secure, ad_question, do_bit, added_pheader, check_subnet, &peer_addr);
  33 +                                       option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, cache_secure, bogusanswer,
  34 +                                       ad_question, do_bit, added_pheader, check_subnet, &peer_addr);
  35
  36                       break;
  37                     }
  38 --
  39 2.1.0
  40