← Back to branch summary

~ubuntu-branches/ubuntu/wily/maradns/wily-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.05/update/3.2.03/deadwood-3.2.02-es-us.noticias.yahoo.com.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski, Tomasz Buchert, Dariusz Dwornikowski
  • Date: 2015-03-27 18:34:08 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20150327183408-wnfachdkdjt96yu6
Tags: 2.0.11-1
http://bugs.debian.org/785536
http://bugs.debian.org/785535
[ Tomasz Buchert ]
* Imported Upstream version 2.0.11

[ Dariusz Dwornikowski ]
* d/patches: 
  - refreshed all patches for new deadwood version
  - removed generating of random prime on build (Closes: #785536) 
* d/rules: date taken from changelog (Closes: #785535)

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.05/update/3.2.03/deadwood-3.2.02-es-us.noticias.yahoo.com.patch
1
 
--- deadwood-3.2.02/src/DwRecurse.c     2012-02-29 01:59:53.000000000 -0600
2
 
+++ deadwood-3.2.03/src/DwRecurse.c     2012-07-21 13:07:03.000000000 -0500
3
 
@@ -1868,8 +1868,9 @@
4
 
         }
5
 
 
6
 
         /* First CNAME pointer... */
7
 
-        value = dwx_make_one_cname_rr(query, 0, action, 2, ttl, &len, 768);
8
 
-        if(value == 0) {
9
 
+        value = dwx_make_one_cname_rr(query, 0, action, 2, ttl, &len, 1024);
10
 
+        if(value == 0 || value->len > 1020) {
11
 
+               dw_log_string("dwx_make_one_cname_rr problem",100);
12
 
                 goto catch_dwx_create_cname_reply;
13
 
         }
14
 
         offsets[0] = 0;
15
 
@@ -1890,7 +1891,8 @@
16
 
                 }
17
 
                 offsets[this_offset * 2] = value->len;
18
 
                 offsets[(this_offset * 2) + 1] = value->len + len;
19
 
-                if(dw_append(temp, value) == -1) {
20
 
+                if(dw_append(temp, value) == -1 || value->len > 1020) {
21
 
+                       dw_log_string("Append error making cname reply",100);
22
 
                         goto catch_dwx_create_cname_reply;
23
 
                 }
24
 
                 dw_destroy(temp);
25
 
@@ -1901,6 +1903,11 @@
26
 
         /* Final answer after CNAME pointers... */
27
 
         dwx_add_final_answer(query, answer, value, offsets, this_offset);
28
 
 
29
 
+       if(value->len > 1020) {
30
 
+               dw_log_string("Final append error making cname reply",100);
31
 
+               goto catch_dwx_create_cname_reply;
32
 
+       }
33
 
+
34
 
         /* Make that a full answer to give the calling function */
35
 
         return value;
36
 
 
37
 
--- deadwood-3.2.03/sqa/do.tests.orig   2012-07-21 13:20:33.000000000 -0500
38
 
+++ deadwood-3.2.03/sqa/do.tests        2012-07-21 13:21:13.000000000 -0500
39
 
@@ -91,6 +91,7 @@
40
 
 TESTS=$TESTS"dwood2rc_d_upstream_servers "
41
 
 TESTS=$TESTS"dwood2rc_n_verbose_level "
42
 
 TESTS=$TESTS"recurse_2link_cname "
43
 
+TESTS=$TESTS"recurse_es-us.noticias.yahoo.com "
44
 
 TESTS=$TESTS"sqa_badid_question "
45
 
 TESTS=$TESTS"sqa_bigpacket " # Needs BIND to run
46
 
 TESTS=$TESTS"sqa_cname_chain "