Fix incorrect three-way merge happened when importing the stale-cache…

… patch Signed-off-by: DL6ER <dl6er@dl6er.de>
pi-hole · Nov 9, 2022 · 4b798e8 · 4b798e8
1 parent 5556dd5
commit 4b798e8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/dnsmasq/forward.c b/src/dnsmasq/forward.c
@@ -1827,13 +1827,6 @@ void receive_query(struct listener *listen, time_t now)
 
  if (m >= 1)
  {
- if (stale && have_pseudoheader)
- {
- u16 swap = htons(EDE_STALE);
-
- m = add_pseudoheader(header, m, ((unsigned char *) header) + udp_size, daemon->edns_pktsz,
- EDNS0_OPTION_EDE, (unsigned char *)&swap, 2, do_bit, 0);
- }
 #ifdef HAVE_DUMPFILE
  dump_packet_udp(DUMP_REPLY, daemon->packet, m, NULL, &source_addr, listen->fd);
 #endif
@@ -1910,6 +1903,13 @@ void receive_query(struct listener *listen, time_t now)
 
  if (m >= 1)
  {
+ if (stale && have_pseudoheader)
+ {
+ u16 swap = htons(EDE_STALE);
+
+ m = add_pseudoheader(header, m, ((unsigned char *) header) + udp_size, daemon->edns_pktsz,
+ EDNS0_OPTION_EDE, (unsigned char *)&swap, 2, do_bit, 0);
+ }
 #ifdef HAVE_DUMPFILE
  dump_packet_udp(DUMP_REPLY, daemon->packet, m, NULL, &source_addr, listen->fd);
 #endif