← Back to branch summary

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

« back to all changes in this revision

Viewing changes to update/1.4.07/maradns-2.0.02-rfc2317.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:
update/1.4.07/maradns-2.0.02-rfc2317.patch
1
 
--- maradns-2.0.02/parse/Csv2_parse.c   2011-02-05 19:21:33.000000000 -0700
2
 
+++ maradns-2.0.03/parse/Csv2_parse.c   2011-02-15 14:12:35.000000000 -0700
3
 
@@ -1,4 +1,4 @@
4
 
-/* Copyright (c) 2004-2006 Sam Trenholme
5
 
+/* Copyright (c) 2004-2011 Sam Trenholme
6
 
  *
7
 
  * TERMS
8
 
  *
9
 
@@ -662,6 +662,11 @@
10
 
         return (csv2_is_alphanum(in) || in > 0x7f);
11
 
 }
12
 
 
13
 
+/* Match on [0-9a-zA-z\-\_\/] or anything utf-8 */
14
 
+int csv2_is_dname(int32 in) {
15
 
+        return (csv2_is_alphanum(in) || in == '/' || in > 0x7f);
16
 
+}
17
 
+
18
 
 /* Match on [0-9a-zA-Z\-\_\%] or anything utf-8 */
19
 
 int csv2_is_dchar(int32 in) {
20
 
         return (csv2_is_text(in) || in == '%');
21
 
@@ -784,7 +789,7 @@
22
 
          * first character of a hostname is already read and added to
23
 
          * the output string */
24
 
         if(starwhitis != 0 && starwhitis != 5) {
25
 
-                if(csv2_is_text(look)) {
26
 
+                if(csv2_is_dname(look)) {
27
 
                         state = NON_DOT_STATE;
28
 
                 }
29
 
                 else if(look == '*') {
30
 
@@ -827,7 +832,7 @@
31
 
                                 return 0;
32
 
                         }
33
 
                 }
34
 
-                else if(state == NON_DOT_STATE && csv2_is_text(look)) {
35
 
+                else if(state == NON_DOT_STATE && csv2_is_dname(look)) {
36
 
                         if(csv2_append_utf8(o,look) < 0) {
37
 
                                 csv2_error(stream,"Error appending character");
38
 
                                 js_destroy(o);
39
 
@@ -864,7 +869,7 @@
40
 
                 /* text character after dot (or at beginning of string)
41
 
                  * means we process that text label in the hostname
42
 
                  * until we see a dot again */
43
 
-                else if(state == DOT_STATE && csv2_is_text(look)) {
44
 
+                else if(state == DOT_STATE && csv2_is_dname(look)) {
45
 
                         state = NON_DOT_STATE;
46
 
                         if(csv2_append_utf8(o,look) < 0) {
47
 
                                 csv2_error(stream,"Error appending character");