~samiam/MaraDNS

ref: 3.5.0002 MaraDNS/update/1.3.03/maradns-1.3.02-csv2_doc.patch -rw-r--r-- 2.2 KiB View raw
db09084f — Sam Trenholme MaraDNS release 3.5.0002 5 months ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
--- maradns-1.3.03/doc/en/source/csv2.ej.orig	2007-02-04 20:52:43.000000000 -0800
+++ maradns-1.3.03/doc/en/source/csv2.ej	2007-02-04 20:54:52.000000000 -0800
@@ -17,13 +17,13 @@
 in csv2 zone files; in order to maintain maximum compatibility with
 MaraDNS 1.2 zone files, this feature is only enabled if a tilde is
 placed between the first and second record.  Otherwise, tildes are
-not allowed in zone files.
+not allowed in zone files (except in comments).
 
 <p>
 
-Most MaraDNS 1.2 csv2 zone files without the tilde character are completely
-compatible with the 1.3 csv2 parser unless csv2_tilde_handling
-is set.  All MaraDNS 1.2 csv2 zone files will parse in MaraDNS 1.3
+Most MaraDNS 1.2 csv2 zone files without the tilde character are
+compatible with the 1.3 csv2 parser, unless csv2_tilde_handling
+is set to 3.  All MaraDNS 1.2 csv2 zone files will parse in MaraDNS 1.3
 if csv2_tilde_handling has a value of 0.  MaraDNS 1.2, starting with
 1.2.12.04, also supports the csv2_tilde_handling variable (as long as it
 has a value of 0); this allows the same configuration and zone files to
--- maradns-1.3.02/doc/en/source/example_csv2	2006-12-21 00:34:46.000000000 -0800
+++ maradns-1.3.03/doc/en/source/example_csv2	2007-02-04 20:59:55.000000000 -0800
@@ -3,10 +3,9 @@
 # First of all, csv2 zone files do not need an SOA record; however, if
 # one is provided, we will make it the SOA record for our zone
 # The SOA record needs to be the first record in the zone if provided
-# This is a commented out record and disabled; when enabling the record,
-# make the + symbol a tilde (shift+` on US keyboards)
+# This is a commented out record and disabled.
 
-#% 	SOA	% email@% 1 7200 3600 604800 1800 +
+#% 	SOA	% email@% 1 7200 3600 604800 1800 ~
 
 # Second of all, csv2 zone files do not need authoritative NS records.
 # If they aren't there, MaraDNS will synthesize them, based on the IP
@@ -14,10 +13,9 @@
 # Mara is bound to both public and private IPs, only the public IPs will
 # be synthesized as NS records)
 
-# Again, when uncommenting this record, make the plus symbol a tilde
 
-#% 	NS 	a.% +
-#%	NS	b.% +
+#% 	NS 	a.% ~
+#%	NS	b.% ~
 
 # Here are some A (ipv4 address) records; since this is the most
 # common field, the zone file format allows a compact representation