1
diff -u maradns-1.2.12.01/sqa/old-testbed/db.0.0.127.in-addr.arpa maradns-1.2.12.02/sqa/old-testbed/db.0.0.127.in-addr.arpa
2
--- maradns-1.2.12.01/sqa/old-testbed/db.0.0.127.in-addr.arpa 2003-01-12 02:17:22.000000000 -0600
3
+++ maradns-1.2.12.02/sqa/old-testbed/db.0.0.127.in-addr.arpa 2006-07-29 21:16:48.000000000 -0500
6
S%|86400|%|hostmaster@example.com.|19771108|7200|3600|604800|1800
8
-Ans1.%|86400|127.0.0.8
9
+Ans1.%|86400|127.0.3.8
11
# A 'PTR' record which, while marked as unauthoritative, allows this
12
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.3
13
diff -u maradns-1.2.12.01/sqa/old-testbed/db.com maradns-1.2.12.02/sqa/old-testbed/db.com
14
--- maradns-1.2.12.01/sqa/old-testbed/db.com 2003-01-12 02:17:35.000000000 -0600
15
+++ maradns-1.2.12.02/sqa/old-testbed/db.com 2006-07-29 21:18:26.000000000 -0500
17
Ncom.|86400|ns2.example.net.
20
-Ans2.example.net.|86400|127.0.0.2
21
+Ans2.example.net.|86400|127.0.3.2
26
#Ansbad.example.com.|86400|10.1.1.1
27
# Good in-bailiwick record
28
#Nexample.com.|86400|ns1.example.com.
29
-#Ans1.example.com.|86400|127.0.0.4
30
+#Ans1.example.com.|86400|127.0.3.4
31
# out-of-bailiwick record
32
Nexample.com.|86400|example-com.example.org.
33
# Massive timeout (disabled)
36
# A 'PTR' record which, while marked as unauthoritative, allows this
37
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.3
38
-P2.0.0.127.in-addr.arpa.|1234|ns2.example.net.
39
+P2.3.0.127.in-addr.arpa.|1234|ns2.example.net.
41
diff -u maradns-1.2.12.01/sqa/old-testbed/db.example.com maradns-1.2.12.02/sqa/old-testbed/db.example.com
42
--- maradns-1.2.12.01/sqa/old-testbed/db.example.com 2003-01-12 02:17:51.000000000 -0600
43
+++ maradns-1.2.12.02/sqa/old-testbed/db.example.com 2006-07-29 21:18:49.000000000 -0500
46
Aexample.com.|86400|10.1.2.3
47
Amx.example.com.|86400|10.1.2.4
48
-Ans1.example.com.|86400|127.0.0.4
49
+Ans1.example.com.|86400|127.0.3.4
52
@example.com.|86400|10|mx.example.com.
54
# A NS delegation chain
55
Nnslist.example.com.|86400|ns.nslist.example.com.
56
Ans.nslist.example.com.|86400|127.99.99.99
57
-Ans.nslist.example.com.|86400|127.0.0.7
58
+Ans.nslist.example.com.|86400|127.0.3.7
61
Texample.com.|86400|Example.com: Buy examples of products online!
64
# A 'PTR' record which, while marked as unauthoritative, allows this
65
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.3
66
-#P4.0.0.127.in-addr.arpa.|1234|ns1.example.com.
67
+#P4.3.0.127.in-addr.arpa.|1234|ns1.example.com.
69
diff -u maradns-1.2.12.01/sqa/old-testbed/db.example.org maradns-1.2.12.02/sqa/old-testbed/db.example.org
70
--- maradns-1.2.12.01/sqa/old-testbed/db.example.org 2003-01-12 02:18:04.000000000 -0600
71
+++ maradns-1.2.12.02/sqa/old-testbed/db.example.org 2006-07-29 21:18:56.000000000 -0500
73
Nexample.org.|86400|ns2.example.org.
76
-Ans2.example.org.|86400|127.0.0.6
77
+Ans2.example.org.|86400|127.0.3.6
80
Ccname.example.org.|86400|www.example.com.
84
# Error handling testing
85
-Aexample-com.example.org.|86400|127.0.0.4
86
+Aexample-com.example.org.|86400|127.0.3.4
88
# A 'PTR' record which, while marked as unauthoritative, allows this
89
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.6
90
-P6.0.0.127.in-addr.arpa.|1234|ns2.example.net.
91
+P6.3.0.127.in-addr.arpa.|1234|ns2.example.net.
93
diff -u maradns-1.2.12.01/sqa/old-testbed/db.org maradns-1.2.12.02/sqa/old-testbed/db.org
94
--- maradns-1.2.12.01/sqa/old-testbed/db.org 2003-01-12 02:18:18.000000000 -0600
95
+++ maradns-1.2.12.02/sqa/old-testbed/db.org 2006-07-29 21:18:43.000000000 -0500
97
Norg.|86400|ns1.example.org.
100
-Ans1.example.org.|86400|127.0.0.5
101
+Ans1.example.org.|86400|127.0.3.5
104
# Error handling testing
105
Nexample.org.|86400|ns2.example.org.
106
-Ans2.example.org.|86400|127.0.0.6
107
+Ans2.example.org.|86400|127.0.3.6
109
# A 'PTR' record which, while marked as unauthoritative, allows this
110
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.5
111
-P5.0.0.127.in-addr.arpa.|1234|ns2.example.net.
112
+P5.3.0.127.in-addr.arpa.|1234|ns2.example.net.
114
diff -u maradns-1.2.12.01/sqa/old-testbed/db-root maradns-1.2.12.02/sqa/old-testbed/db-root
115
--- maradns-1.2.12.01/sqa/old-testbed/db-root 2003-01-12 02:18:29.000000000 -0600
116
+++ maradns-1.2.12.02/sqa/old-testbed/db-root 2006-07-29 21:18:34.000000000 -0500
118
N0.0.127.in-addr.arpa.|86400|ns1.0.0.127.in-addr.arpa.
120
# Some 'IN A' records
121
-Ans1.example.net.|86400|127.0.0.1
122
+Ans1.example.net.|86400|127.0.3.1
123
# Deliberately an address that does not exist
124
-Ans2.example.net.|86400|127.0.0.2
125
-Ans1.example.org.|86400|127.0.0.5
126
-Ans1.0.0.127.in-addr.arpa.|86400|127.0.0.8
127
+Ans2.example.net.|86400|127.0.3.2
128
+Ans1.example.org.|86400|127.0.3.5
129
+Ans1.0.0.127.in-addr.arpa.|86400|127.0.3.8
131
# A 'PTR' record which, while marked as unauthoritative, allows this
132
# program to work with the obsolete tool nslookup when bound on IP 127.0.0.3
133
-P1.0.0.127.in-addr.arpa.|1234|ns1.example.net.
134
+P1.3.0.127.in-addr.arpa.|1234|ns1.example.net.
136
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc maradns-1.2.12.02/sqa/old-testbed/mararc
137
--- maradns-1.2.12.01/sqa/old-testbed/mararc 2001-10-16 18:44:46.000000000 -0600
138
+++ maradns-1.2.12.02/sqa/old-testbed/mararc 2006-07-29 21:15:09.000000000 -0500
140
#csv1["example.com."] = "db.example.com"
142
# The address this DNS server runs on
143
- bind_address = "127.0.0.3"
144
-#bind_address = "127.0.0.1"
145
+ bind_address = "127.0.3.3"
146
+#bind_address = "127.0.3.1"
147
# The directory with all of the zone files
148
chroot_dir = "/var/maradns"
149
# chroot_dir = "/home/set/maradns/zone"
150
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.1 maradns-1.2.12.02/sqa/old-testbed/mararc.1
151
--- maradns-1.2.12.01/sqa/old-testbed/mararc.1 2002-03-02 03:56:16.000000000 -0600
152
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.1 2006-07-29 21:15:23.000000000 -0500
155
# The address this DNS server runs on
156
# bind_address = "127.0.0.3"
157
-bind_address = "127.0.0.1"
158
+bind_address = "127.0.3.1"
159
# The directory with all of the zone files
160
chroot_dir = "/var/maradns"
161
# chroot_dir = "/home/set/maradns/zone"
162
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.2 maradns-1.2.12.02/sqa/old-testbed/mararc.2
163
--- maradns-1.2.12.01/sqa/old-testbed/mararc.2 2002-03-02 03:56:22.000000000 -0600
164
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.2 2006-07-29 21:15:30.000000000 -0500
167
# The address this DNS server runs on
168
# bind_address = "127.0.0.3"
169
-bind_address = "127.0.0.2"
170
+bind_address = "127.0.3.2"
171
# The directory with all of the zone files
172
chroot_dir = "/var/maradns"
173
# chroot_dir = "/home/set/maradns/zone"
174
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.4 maradns-1.2.12.02/sqa/old-testbed/mararc.4
175
--- maradns-1.2.12.01/sqa/old-testbed/mararc.4 2002-03-02 03:56:30.000000000 -0600
176
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.4 2006-07-29 21:15:45.000000000 -0500
179
# The address this DNS server runs on
180
# bind_address = "127.0.0.3"
181
-bind_address = "127.0.0.4"
182
+bind_address = "127.0.3.4"
183
# The directory with all of the zone files
184
chroot_dir = "/var/maradns"
185
# chroot_dir = "/home/set/maradns/zone"
186
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.5 maradns-1.2.12.02/sqa/old-testbed/mararc.5
187
--- maradns-1.2.12.01/sqa/old-testbed/mararc.5 2002-03-02 03:56:36.000000000 -0600
188
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.5 2006-07-29 21:15:52.000000000 -0500
191
# The address this DNS server runs on
192
# bind_address = "127.0.0.3"
193
-bind_address = "127.0.0.5"
194
+bind_address = "127.0.3.5"
195
# The directory with all of the zone files
196
chroot_dir = "/var/maradns"
197
# chroot_dir = "/home/set/maradns/zone"
198
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.6 maradns-1.2.12.02/sqa/old-testbed/mararc.6
199
--- maradns-1.2.12.01/sqa/old-testbed/mararc.6 2002-03-02 03:56:43.000000000 -0600
200
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.6 2006-07-29 21:15:58.000000000 -0500
203
# The address this DNS server runs on
204
# bind_address = "127.0.0.3"
205
-bind_address = "127.0.0.6"
206
+bind_address = "127.0.3.6"
207
# The directory with all of the zone files
208
chroot_dir = "/var/maradns"
209
# chroot_dir = "/home/set/maradns/zone"
210
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.7 maradns-1.2.12.02/sqa/old-testbed/mararc.7
211
--- maradns-1.2.12.01/sqa/old-testbed/mararc.7 2002-03-02 03:56:49.000000000 -0600
212
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.7 2006-07-29 21:16:09.000000000 -0500
215
# The address this DNS server runs on
216
# bind_address = "127.0.0.3"
217
-bind_address = "127.0.0.7"
218
+bind_address = "127.0.3.7"
219
# The directory with all of the zone files
220
chroot_dir = "/var/maradns"
221
# chroot_dir = "/home/set/maradns/zone"
222
diff -u maradns-1.2.12.01/sqa/old-testbed/mararc.8 maradns-1.2.12.02/sqa/old-testbed/mararc.8
223
--- maradns-1.2.12.01/sqa/old-testbed/mararc.8 2002-12-25 20:21:01.000000000 -0600
224
+++ maradns-1.2.12.02/sqa/old-testbed/mararc.8 2006-07-29 21:16:16.000000000 -0500
227
# The address this DNS server runs on
228
# bind_address = "127.0.0.3"
229
-bind_address = "127.0.0.8"
230
+bind_address = "127.0.3.8"
231
# The directory with all of the zone files
232
chroot_dir = "/var/maradns"
233
# chroot_dir = "/home/set/maradns/zone"
234
diff -u maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test maradns-1.2.12.02/sqa/old-testbed/cache.stress.test
235
--- maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test 2003-01-17 22:19:43.000000000 -0600
236
+++ maradns-1.2.12.02/sqa/old-testbed/cache.stress.test 2006-08-05 14:59:12.000000000 -0500
238
for(a=1;a<='$NUM';a++)
241
- print "askmara A"a".example.com. > /dev/null"
242
+ print "askmara A"a".example.com. 127.0.3.3 > /dev/null"
244
- print "askmara Ac"a".example.com. > /dev/null"
245
+ print "askmara Ac"a".example.com. 127.0.3.3 > /dev/null"
246
# CNAME records which point nowhere (SOA caching)
247
- print "askmara Ad"a".example.com. > /dev/null"
248
+ print "askmara Ad"a".example.com. 127.0.3.3 > /dev/null"
249
# NS records which point nowhere
250
- #print "../sendudp Asub.r"a".example.com. > /dev/null"
251
+ #print "../sendudp Asub.r"a".example.com. 127.0.3.3 > /dev/null"
252
print "echo "a" | tr '\''\\012'\'' '\''\\015'\''"
255
diff -u maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.2 maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.2
256
--- maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.2 2001-11-16 21:04:13.000000000 -0600
257
+++ maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.2 2006-08-05 14:59:56.000000000 -0500
260
# This attempts to recreate the maradns crashes
261
awk 'BEGIN{for(a=0;a<2500;a++){
262
- print "askmara Atest.example.org. > /dev/null &";
263
+ print "askmara Atest.example.org. 127.0.3.3 > /dev/null &";
264
print "echo "a" | tr '\''\\012'\'' '\''\\015'\''"
267
diff -u maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.3 maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.3
268
--- maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.3 2001-11-16 21:04:48.000000000 -0600
269
+++ maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.3 2006-08-05 15:00:10.000000000 -0500
271
for(a=1;a<='$NUM';a++)
273
for(b=0;b<1000;b++) {
274
- print "askmara A"a".example.com. > /dev/null &"
275
- print "askmara Ac"a".example.com. > /dev/null &"
276
- print "askmara Ad"a".example.com. > /dev/null &"
277
+ print "askmara A"a".example.com. 127.0.3.3 > /dev/null &"
278
+ print "askmara Ac"a".example.com. 127.0.3.3 > /dev/null &"
279
+ print "askmara Ad"a".example.com. 127.0.3.3 > /dev/null &"
280
print "echo "a" "b" \" \" | tr '\''\\012'\'' '\''\\015'\''"
283
diff -u maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.4 maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.4
284
--- maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.4 2002-02-25 02:58:30.000000000 -0600
285
+++ maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.4 2006-08-05 15:00:54.000000000 -0500
287
for(a=1;a<='$NUM';a++)
290
- print "askmara A"a".example.com. > /dev/null"
291
+ print "askmara A"a".example.com. 127.0.3.3 > /dev/null"
293
- print "askmara Ac"a".example.com. > /dev/null"
294
+ print "askmara Ac"a".example.com. 127.0.3.3 > /dev/null"
295
# CNAME records which point nowhere (SOA caching)
296
- print "askmara Ad"a".example.com. > /dev/null"
297
+ print "askmara Ad"a".example.com. 127.0.3.3 > /dev/null"
298
print "echo "a" | tr '\''\\012'\'' '\''\\015'\''"
301
diff -u maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.sendudp maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.sendudp
302
--- maradns-Q.20060805.1/sqa/old-testbed/cache.stress.test.sendudp 2002-02-25 02:59:01.000000000 -0600
303
+++ maradns-1.2.12.02/sqa/old-testbed/cache.stress.test.sendudp 2006-08-05 15:00:31.000000000 -0500
305
for(a=1;a<='$NUM';a++)
308
- print "../sendudp A"a".example.com. > /dev/null"
309
+ print "../sendudp A"a".example.com. 127.0.3.3 > /dev/null"
311
- print "../sendudp Ac"a".example.com. > /dev/null"
312
+ print "../sendudp Ac"a".example.com. 127.0.3.3 > /dev/null"
313
# CNAME records which point nowhere (SOA caching)
314
- print "../sendudp Ad"a".example.com. > /dev/null"
315
+ print "../sendudp Ad"a".example.com. 127.0.3.3 > /dev/null"
316
# NS records which point nowhere
317
- print "../sendudp Asub.r"a".example.com. > /dev/null"
318
+ print "../sendudp Asub.r"a".example.com. 127.0.3.3 > /dev/null"
319
print "echo "a" | tr '\''\\012'\'' '\''\\015'\''"
322
--- maradns-Q.20060805.1/sqa/old-testbed/mararc 2006-08-05 13:17:33.000000000 -0500
323
+++ maradns-1.2.12.02/sqa/old-testbed/mararc 2006-08-05 15:06:04.000000000 -0500
326
zone_transfer_acl = "192.168.42.0/24"
328
+recursive_acl = "127.0.0.1/8"
330
+root_servers["."] = "127.0.3.1"
331
--- maradns-1.2.12.02/sqa/old-testbed/run.testbed.orig 2006-08-13 23:24:55.000000000 -0500
332
+++ maradns-1.2.12.02/sqa/old-testbed/run.testbed 2006-08-13 23:27:21.000000000 -0500
336
-maradns -f /etc/mararc.1 &
337
-maradns -f /etc/mararc.2 &
338
+../../server/maradns -f /etc/mararc.1 &
339
+../../server/maradns -f /etc/mararc.2 &
340
# .3 is reserved for the recursive server
341
-maradns -f /etc/mararc.4 &
342
-maradns -f /etc/mararc.5 &
343
-maradns -f /etc/mararc.6 &
344
-maradns -f /etc/mararc.7 &
345
-maradns -f /etc/mararc.8 &
346
+../../server/maradns -f /etc/mararc.4 &
347
+../../server/maradns -f /etc/mararc.5 &
348
+../../server/maradns -f /etc/mararc.6 &
349
+../../server/maradns -f /etc/mararc.7 &
350
+../../server/maradns -f /etc/mararc.8 &
351
# Dead host simulated
352
#../dead_host_simulate 127.240.240.241 &
353
#../dead_host_simulate 127.240.240.242 &