]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Fix argument-order botch which broke DNSSEC for TCP queries.
authorSimon Kelley <simon@thekelleys.org.uk>
Tue, 28 Apr 2015 19:45:57 +0000 (20:45 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Tue, 28 Apr 2015 19:45:57 +0000 (20:45 +0100)
src/forward.c

index 1c7da3f5655cb9e3d303a3e0e4376c1e48b8305d..a8e403c4b25e4db23c878dff2da74c3178e24e61 100644 (file)
@@ -1996,8 +1996,9 @@ unsigned char *tcp_request(int confd, time_t now,
                            }
                          else
                            result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS"));
-                          if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
-                            domain = daemon->namebuff;
+                         
+                         if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
+                           domain = daemon->namebuff;
 
                          log_query(F_KEYTAG | F_SECSTAT, domain, NULL, result);
                          
@@ -2040,8 +2041,8 @@ unsigned char *tcp_request(int confd, time_t now,
 #endif
 
                      m = process_reply(header, now, last_server, (unsigned int)m, 
-                                       option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, bogusanswer,
-                                       cache_secure, ad_question, do_bit, added_pheader, check_subnet, &peer_addr); 
+                                       option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, cache_secure, bogusanswer,
+                                       ad_question, do_bit, added_pheader, check_subnet, &peer_addr); 
                      
                      break;
                    }