~ubuntu-branches/ubuntu/quantal/maradns/quantal

« back to all changes in this revision

Viewing changes to update/2.0.03/maradns-2.0.02-RTFM.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-01-12 23:35:38 UTC
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: package-import@ubuntu.com-20120112233538-5jkaqrh9nbqtf1ey
Tags: upstream-2.0.04+really1.4.09
ImportĀ upstreamĀ versionĀ 2.0.04+really1.4.09

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- maradns-2.0.02/parse/Csv2_rr_txt.c  2011-02-05 20:21:32.000000000 -0600
2
 
+++ maradns-2.0.03/parse/Csv2_rr_txt.c  2011-06-10 13:34:02.677253353 -0500
3
 
@@ -1,4 +1,4 @@
4
 
-/* Copyright (c) 2004-2007 Sam Trenholme
5
 
+/* Copyright (c) 2004-2007,2011 Sam Trenholme
6
 
  *
7
 
  * TERMS
8
 
  *
9
 
@@ -425,26 +425,31 @@
10
 
                                 if(look == '#') {
11
 
                                         csv2_error(stream,
12
 
                            "The # character is not allowed in TXT records\n"
13
 
-                           "Please use the '\\x23' escape sequence instead.");
14
 
+                           "Please use the '\\x23' escape sequence instead.\n"
15
 
+                          "man csv2_txt for more information");
16
 
                                         return 0;
17
 
                                 } else if(look == '|') {
18
 
                                         csv2_error(stream,
19
 
                            "The | character is not allowed in TXT records\n"
20
 
-                           "Please use the '\\x7c' escape sequence instead.");
21
 
+                           "Please use the '\\x7c' escape sequence instead.\n"
22
 
+                          "man csv2_txt for more information");
23
 
                                         return 0;
24
 
                                 } else if(look == '~') {
25
 
                                         csv2_error(stream,
26
 
                            "The ~ character is not allowed in TXT records\n"
27
 
-                           "Please use the '\\x7e' escape sequence instead.");
28
 
+                           "Please use the '\\x7e' escape sequence instead.\n"
29
 
+                          "man csv2_txt for more information");
30
 
                                         return 0;
31
 
                                 } else if(look == 127) {
32
 
                                         csv2_error(stream,
33
 
                            "The DEL character is not allowed in TXT records\n"
34
 
-                           "Please use the '\\x7f' escape sequence instead.");
35
 
+                           "Please use the '\\x7f' escape sequence instead.\n"
36
 
+                          "man csv2_txt for more information");
37
 
                                 } else if(look < ' ') {
38
 
                                         csv2_error(stream,
39
 
    "Control characters (including newlines) are not allowed in TXT records\n"
40
 
-                        "Please use the appropriate escape sequence instead.");
41
 
+                        "Please use the appropriate escape sequence instead.\n"
42
 
+                          "man csv2_txt for more information");
43
 
                                         return 0;
44
 
                                 } else if(csv2_txt_append(out, look, &txt_len)
45
 
                                        != 1) {