← Back to branch summary

~ubuntu-branches/ubuntu/trusty/maradns/trusty-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.05/update/2.9.02/deadwood-2.9.01-show_not_there_2.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski
  • Date: 2014-02-16 19:36:04 UTC
  • mfrom: (1.2.11) (21.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20140216193604-xtmcopn9pilzszae
Tags: 2.0.09-1
http://bugs.debian.org/739084
http://bugs.debian.org/739755
http://bugs.debian.org/710903
http://bugs.debian.org/709826
http://bugs.debian.org/701657
* New maintainer (Closes: #739084)
* New upstream release to unstable
* Several security bugs (Closes: #739755)
   - security bugfix for CVE-2011-5055, CVE-2011-5056, CVE-2012-0024,
   CVE-2012-1570
   - security bugfix agains blind spoofing attack (no CVE number)
   - security bugfix for packet of death attack (no CVE number)
* Bump standards to 3.9.5
* Updated d/postinst to no longer modify conffiles (Closes: #710903)
* Init script fixed (Closes: #709826)
* --reinstall no longer kills the process (Closes: #701657)
* Updated old d/changelog entries, added information when the CVEs were
  fixed: 2.0.06-1, 2.0.04-1, 1.4.11-1, 1.2.12.06-1, 1.2.12.05-1, 1.0.28-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.05/update/2.9.02/deadwood-2.9.01-show_not_there_2.patch
 
1
--- deadwood-2.9.02/src/DwRecurse.c.orig        2010-07-28 14:35:29.000000000 -0700
 
2
+++ deadwood-2.9.02/src/DwRecurse.c     2010-07-28 15:41:27.000000000 -0700
 
3
@@ -1434,7 +1434,7 @@
 
4
         if(view->ns_types[0] == RR_SOA) {
 
5
                 return TYPE_NOT_THERE; /* May be NXDOMAIN; look at header */
 
6
         }
 
7
-        if((view->ns_types[0] & RRX_NS_MASK) == RRX_GLUELESS_NS) {
 
8
+        if(view->ns_types[0] == RR_NS) {
 
9
                 return TYPE_NS_REFER;
 
10
         }
 
11
         return TYPE_NO_USEFUL_DATA;
 
12
@@ -1505,13 +1505,15 @@
 
13
         if(view == 0 ||
 
14
            dwx_check_answer_section(in,query,view) == -1 ||
 
15
            dwx_if_an_then_no_ns_nor_ar(view) == -1 ||
 
16
-           dwx_cleanup_ns_ar(view) == -1 ||
 
17
-           dwx_check_bailiwick_ns_section(view,query,bailiwick) == -1 ||
 
18
-           dwx_link_ns_records(view) == -1
 
19
-           ) {
 
20
+           dwx_cleanup_ns_ar(view) == -1) {
 
21
                 goto catch_dwx_dissect_packet;
 
22
         }
 
23
         type = dwx_determine_answer_type(view,query);
 
24
+       if(type == TYPE_NS_REFER && (
 
25
+           dwx_check_bailiwick_ns_section(view,query,bailiwick) == -1 ||
 
26
+           dwx_link_ns_records(view) == -1 )) {
 
27
+                goto catch_dwx_dissect_packet;
 
28
+        }
 
29
 
 
30
         out = dwx_make_cache_string(view,type);
 
31
         dwx_zap_dns_details(view);