1
--- deadwood-3.0.03/src/DwMararc.h 2011-07-22 15:41:29.000000000 -0500
2
+++ deadwood-3.0.04/src/DwMararc.h 2011-09-10 11:30:08.499404642 -0500
4
/* The actual state machine that we use to parse a MaraRC file; this is
5
* described in the file doc/internals/MARARC.parser */
7
-#define dwm_machine "a Hb Y1c Wa Rxp T;\n" \
8
+#define dwm_machine "a Hb Y1c Wxb Rxp T;\n" \
10
"c B1c Wd =e [f +g (y\n" \
18
+ "xb Hb Wxb Rxp T;\n"
20
/* A tokenized single state in the finite state machine */
22
--- deadwood-3.0.03/doc/internals/MARARC.parser 2009-08-21 09:59:17.000000000 -0500
23
+++ deadwood-3.0.04/doc/internals/MARARC.parser 2011-09-10 11:30:08.500407417 -0500
25
And here is the specified state machine for mararc processing. This
26
state machine is run for each line in the mararc file
28
-Start of line: a: Hb Y1c Wa Rxp T;
29
+Start of line: a: Hb Y1c Wxb Rxp T;
30
In comment: b: Xb Rxp T;
31
Reading mararc parameter: c: B1c Wd =e [f +g (y
32
Whitespace after mararc parameter: d: Wd =e [f +g
35
In filename for execfile: z: I7z Qxa
36
Quote after execfile filename: xa: )k
37
+After whitespace in line: xb: Hb Wxb Rxp T;
39
Once a line is processed, we then look at the value of variable 1 (the
41
--- deadwood-3.0.03/doc/Deadwood.ej 2011-01-29 14:55:07.000000000 -0600
42
+++ deadwood-3.0.04/doc/Deadwood.ej 2011-09-10 11:32:40.564542222 -0500
45
<h1>CONFIGURATION FILE FORMAT</h1>
47
+The Deadwood configuration file is modeled after Python 2's syntax. Any
48
+valid Deadwood configuration file should also correctly parse in both
49
+Python 2.4.3 and Python 2.6.6. If any configuration file does correctly
50
+parse in Deadwood but raises a syntax error in Python, this is a bug that
55
+This in mind, whitespace is significant; Deadwood parameters must be in
56
+the leftmost column with no leading whitespace. This is a valid line
57
+(as long as there are no spaces to its left):
60
+recursive_acl = "127.0.0.1/16"
63
+The following line, however, will raise a parse error:
66
+ recursive_acl = "127.0.0.1/16"
69
+Observe the space to the left of the "recusive_acl" string in the incorrectly
75
The Deadwood configuration file supports the following parameters:
79
The default value is 1: Resource record rotation enabled.
81
<h2>max_inflights</h2>
82
-The maximum number of simultanious clients we process at the same
83
+The maximum number of simultaneous clients we process at the same
84
time for the same query.
87
-If, while processone a query for, say, "example.com.", another
88
+If, while processing a query for, say, "example.com.", another
89
DNS client sends to Deadwood another query for example.com, instead
90
of creating a new query to process example.com, Deadwood will
91
attach the new client to the same query that is already "in flight", and
95
The reason for this is because BIND engages in unexpected behavior
96
-when a host name deoesn't end in a dot, and by forcing a dot at the end
97
+when a host name doesn't end in a dot, and by forcing a dot at the end
98
of a hostname, Deadwood doesn't have to guess whether the user wants
99
BIND's behavior or the "normal" behavior.
101
--- deadwood-3.0.03/doc/Windows/Reference.txt 2010-09-24 20:45:11.000000000 -0500
102
+++ deadwood-3.0.04/doc/Windows/Reference.txt 2011-09-10 11:38:25.459795265 -0500
105
CONFIGURATION FILE FORMAT
107
+ The Deadwood configuration file is modeled after Python 2's
108
+ syntax. Any valid Deadwood configuration file should also
109
+ correctly parse in both Python 2.4.3 and Python 2.6.6. If any
110
+ configuration file does correctly parse in Deadwood but raises a
111
+ syntax error in Python, this is a bug that should be fixed.
113
+ This in mind, whitespace is significant; Deadwood parameters
114
+ must be in the leftmost column with no leading whitespace. This
115
+ is a valid line (as long as there are no spaces to its left):
117
+recursive_acl = "127.0.0.1/16"
119
+ The following line, however, will raise a parse error:
121
+ recursive_acl = "127.0.0.1/16"
123
+ Observe the space to the left of the "recusive_acl" string in
124
+ the incorrectly formatted line.
126
The Deadwood configuration file, dwood3rc.txt, supports the following
129
@@ -477,55 +496,55 @@
131
Here is an example dwood3rc configuration file:
133
- # This is an example deadwood rc file
134
- # Note that comments are started by the hash symbol
135
+# This is an example deadwood rc file
136
+# Note that comments are started by the hash symbol
138
- bind_address="127.0.0.1" # IP we bind to
139
+bind_address="127.0.0.1" # IP we bind to
141
- # The following line is disabled by being commented out
142
- #bind_address="::1" # We have optional IPv6 support
143
+# The following line is disabled by being commented out
144
+#bind_address="::1" # We have optional IPv6 support
146
- # Directory we run program from (not used in Win32)
147
- chroot_dir = "/etc/deadwood"
149
- # The following upstream DNS servers are Google's
150
- # (as of December 2009) public DNS servers. For
151
- # more information, see the page at
152
- # http://code.google.com/speed/public-dns/
154
- # If neither root_servers nor upstream_servers are set,
155
- # Deadwood will use the default ICANN root servers.
156
- #upstream_servers = {}
157
- #upstream_servers["."]="8.8.8.8, 8.8.4.4"
159
- # Who is allowed to use the cache. This line
160
- # allows anyone with "127.0" as the first two
161
- # digits of their IP to use Deadwood
162
- recursive_acl = "127.0.0.1/16"
164
- # Maximum number of pending requests
167
- # Send SERVER FAIL when overloaded
168
- handle_overload = 1
170
- maradns_uid = 99 # UID Deadwood runs as
171
- maradns_gid = 99 # GID Deadwood runs as
173
- maximum_cache_elements = 60000
175
- # If you want to read and write the cache from disk,
176
- # make sure chroot_dir above is readable and writable
177
- # by the maradns_uid/gid above, and uncomment the
179
- #cache_file = "dw_cache"
181
- # If your upstream DNS server converts "not there" DNS replies
182
- # in to IPs, this parameter allows Deadwood to convert any reply
183
- # with a given IP back in to a "not there" IP. If any of the IPs
184
- # listed below are in a DNS answer, Deadwood converts the answer
185
- # in to a "not there"
186
- #ip_blacklist = "10.222.33.44, 10.222.3.55"
187
+# Directory we run program from (not used in Win32)
188
+chroot_dir = "/etc/deadwood"
190
+# The following upstream DNS servers are Google's
191
+# (as of December 2009) public DNS servers. For
192
+# more information, see the page at
193
+# http://code.google.com/speed/public-dns/
195
+# If neither root_servers nor upstream_servers are set,
196
+# Deadwood will use the default ICANN root servers.
197
+#upstream_servers = {}
198
+#upstream_servers["."]="8.8.8.8, 8.8.4.4"
200
+# Who is allowed to use the cache. This line
201
+# allows anyone with "127.0" as the first two
202
+# digits of their IP to use Deadwood
203
+recursive_acl = "127.0.0.1/16"
205
+# Maximum number of pending requests
208
+# Send SERVER FAIL when overloaded
211
+maradns_uid = 99 # UID Deadwood runs as
212
+maradns_gid = 99 # GID Deadwood runs as
214
+maximum_cache_elements = 60000
216
+# If you want to read and write the cache from disk,
217
+# make sure chroot_dir above is readable and writable
218
+# by the maradns_uid/gid above, and uncomment the
220
+#cache_file = "dw_cache"
222
+# If your upstream DNS server converts "not there" DNS replies
223
+# in to IPs, this parameter allows Deadwood to convert any reply
224
+# with a given IP back in to a "not there" IP. If any of the IPs
225
+# listed below are in a DNS answer, Deadwood converts the answer
226
+# in to a "not there"
227
+#ip_blacklist = "10.222.33.44, 10.222.3.55"