djbdns/sme10/320-bugfix-dnscache-cache-soa-records.patch

--- a/query.c
+++ b/query.c
@@ -342,6 +342,29 @@ static int doit(struct query *z,int stat
       }
     }
 
+    if (typematch(DNS_T_SOA,dtype)) {
+      byte_copy(key,2,DNS_T_SOA);
+      cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
+      if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
+        log_cachedanswer(d,DNS_T_SOA);
+        if (!rqa(z)) goto DIE;
+        pos = 0;
+        while (pos = dns_packet_copy(cached,cachedlen,pos,misc,20)) {
+          pos = dns_packet_getname(cached,cachedlen,pos,&t2);
+          if (!pos) break;
+          pos = dns_packet_getname(cached,cachedlen,pos,&t3);
+          if (!pos) break;
+          if (!response_rstart(d,DNS_T_SOA,ttl)) goto DIE;
+          if (!response_addname(t2)) goto DIE;
+          if (!response_addname(t3)) goto DIE;
+          if (!response_addbytes(misc,20)) goto DIE;
+          response_rfinish(RESPONSE_ANSWER);
+        }
+        cleanup(z);
+        return 1;
+      }
+    }
+
     if (typematch(DNS_T_A,dtype)) {
       byte_copy(key,2,DNS_T_A);
       cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
@@ -374,7 +397,7 @@ static int doit(struct query *z,int stat
       }
     }
 
-    if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) {
+    if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype)) {
       byte_copy(key,2,dtype);
       cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
       if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) {
@@ -601,15 +624,24 @@ static int doit(struct query *z,int stat
     else if (byte_equal(type,2,DNS_T_AXFR))
       ;
     else if (byte_equal(type,2,DNS_T_SOA)) {
+      int non_authority = 0;
+      save_start();
       while (i < j) {
         pos = dns_packet_skipname(buf,len,records[i]); if (!pos) goto DIE;
         pos = dns_packet_getname(buf,len,pos + 10,&t2); if (!pos) goto DIE;
         pos = dns_packet_getname(buf,len,pos,&t3); if (!pos) goto DIE;
         pos = dns_packet_copy(buf,len,pos,misc,20); if (!pos) goto DIE;
-        if (records[i] < posauthority)
+        if (records[i] < posauthority) {
           log_rrsoa(whichserver,t1,t2,t3,misc,ttl);
+          save_data(misc,20);
+          save_data(t2,dns_domain_length(t2));
+          save_data(t3,dns_domain_length(t3));
+          non_authority++;
+        }
         ++i;
       }
+      if (non_authority)
+        save_finish(DNS_T_SOA,t1,ttl);
     }
     else if (byte_equal(type,2,DNS_T_CNAME)) {
       pos = dns_packet_skipname(buf,len,records[j - 1]); if (!pos) goto DIE;
1	--- a/query.c
2	+++ b/query.c
3	@@ -342,6 +342,29 @@ static int doit(struct query *z,int stat
4	}
5	}
6
7	+ if (typematch(DNS_T_SOA,dtype)) {
8	+ byte_copy(key,2,DNS_T_SOA);
9	+ cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
10	+ if (cached && (cachedlen \|\| byte_diff(dtype,2,DNS_T_ANY))) {
11	+ log_cachedanswer(d,DNS_T_SOA);
12	+ if (!rqa(z)) goto DIE;
13	+ pos = 0;
14	+ while (pos = dns_packet_copy(cached,cachedlen,pos,misc,20)) {
15	+ pos = dns_packet_getname(cached,cachedlen,pos,&t2);
16	+ if (!pos) break;
17	+ pos = dns_packet_getname(cached,cachedlen,pos,&t3);
18	+ if (!pos) break;
19	+ if (!response_rstart(d,DNS_T_SOA,ttl)) goto DIE;
20	+ if (!response_addname(t2)) goto DIE;
21	+ if (!response_addname(t3)) goto DIE;
22	+ if (!response_addbytes(misc,20)) goto DIE;
23	+ response_rfinish(RESPONSE_ANSWER);
24	+ }
25	+ cleanup(z);
26	+ return 1;
27	+ }
28	+ }
29	+
30	if (typematch(DNS_T_A,dtype)) {
31	byte_copy(key,2,DNS_T_A);
32	cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
33	@@ -374,7 +397,7 @@ static int doit(struct query *z,int stat
34	}
35	}
36
37	- if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype)) {
38	+ if (!typematch(DNS_T_ANY,dtype) && !typematch(DNS_T_AXFR,dtype) && !typematch(DNS_T_NS,dtype) && !typematch(DNS_T_PTR,dtype) && !typematch(DNS_T_A,dtype) && !typematch(DNS_T_MX,dtype) && !typematch(DNS_T_SOA,dtype)) {
39	byte_copy(key,2,dtype);
40	cached = cache_get(key,dlen + 2,&cachedlen,&ttl);
41	if (cached && (cachedlen \|\| byte_diff(dtype,2,DNS_T_ANY))) {
42	@@ -601,15 +624,24 @@ static int doit(struct query *z,int stat
43	else if (byte_equal(type,2,DNS_T_AXFR))
44	;
45	else if (byte_equal(type,2,DNS_T_SOA)) {
46	+ int non_authority = 0;
47	+ save_start();
48	while (i < j) {
49	pos = dns_packet_skipname(buf,len,records[i]); if (!pos) goto DIE;
50	pos = dns_packet_getname(buf,len,pos + 10,&t2); if (!pos) goto DIE;
51	pos = dns_packet_getname(buf,len,pos,&t3); if (!pos) goto DIE;
52	pos = dns_packet_copy(buf,len,pos,misc,20); if (!pos) goto DIE;
53	- if (records[i] < posauthority)
54	+ if (records[i] < posauthority) {
55	log_rrsoa(whichserver,t1,t2,t3,misc,ttl);
56	+ save_data(misc,20);
57	+ save_data(t2,dns_domain_length(t2));
58	+ save_data(t3,dns_domain_length(t3));
59	+ non_authority++;
60	+ }
61	++i;
62	}
63	+ if (non_authority)
64	+ save_finish(DNS_T_SOA,t1,ttl);
65	}
66	else if (byte_equal(type,2,DNS_T_CNAME)) {
67	pos = dns_packet_skipname(buf,len,records[j - 1]); if (!pos) goto DIE;