1 diff -ur maradns-1.1.22.orig/doc/en/examples/example_authoritative_mararc.txt maradns-1.1.22/doc/en/examples/example_authoritative_mararc.txt
2 --- maradns-1.1.22.orig/doc/en/examples/example_authoritative_mararc.txt Mon Nov 18 10:03:08 2002
3 +++ maradns-1.1.22/doc/en/examples/example_authoritative_mararc.txt Mon Aug 23 12:51:52 2004
5 # The directory with all of the zone files
6 chroot_dir = "/etc/maradns"
7 # The numeric UID MaraDNS will run as
10 # The maximum number of processes the zone server is allowed to run
13 diff -ur maradns-1.1.22.orig/doc/en/examples/example_full_mararc maradns-1.1.22/doc/en/examples/example_full_mararc
14 --- maradns-1.1.22.orig/doc/en/examples/example_full_mararc Thu Jun 3 22:55:10 2004
15 +++ maradns-1.1.22/doc/en/examples/example_full_mararc Mon Aug 23 12:51:26 2004
17 # The directory with all of the zone files
18 chroot_dir = "/etc/maradns"
19 # The numeric UID MaraDNS will run as
22 # The (optional) numeric GID MaraDNS will run as
25 # The maximum number of threads (or processes, with the zone server)
26 # MaraDNS is allowed to run
28 diff -ur maradns-1.1.22.orig/doc/en/examples/example_mararc maradns-1.1.22/doc/en/examples/example_mararc
29 --- maradns-1.1.22.orig/doc/en/examples/example_mararc Mon Nov 18 10:03:08 2002
30 +++ maradns-1.1.22/doc/en/examples/example_mararc Mon Aug 23 12:51:41 2004
32 # The directory with all of the zone files
33 chroot_dir = "/etc/maradns"
34 # The numeric UID MaraDNS will run as
37 # The maximum number of threads (or processes, with the zone server)
38 # MaraDNS is allowed to run
40 diff -ur maradns-1.1.22.orig/doc/en/examples/example_recursive_mararc.txt maradns-1.1.22/doc/en/examples/example_recursive_mararc.txt
41 --- maradns-1.1.22.orig/doc/en/examples/example_recursive_mararc.txt Fri Jun 4 00:57:17 2004
42 +++ maradns-1.1.22/doc/en/examples/example_recursive_mararc.txt Mon Aug 23 12:52:43 2004
44 # The directory with all of the zone files
45 chroot_dir = "/etc/maradns"
46 # The numeric UID MaraDNS will run as
49 # The maximum number of threads (or processes, with the zone server)
50 # MaraDNS is allowed to run
52 diff -ur maradns-1.1.22.orig/doc/en/man/mararc.5 maradns-1.1.22/doc/en/man/mararc.5
53 --- maradns-1.1.22.orig/doc/en/man/mararc.5 Mon Jun 21 21:50:15 2004
54 +++ maradns-1.1.22/doc/en/man/mararc.5 Mon Aug 23 12:54:41 2004
56 damage a potential attacker can cause should there be a security
57 problem with MaraDNS. This is the UID maradns becomes.
59 -The default UID is 99.
60 +The default UID is 58.
65 maradns_gid: The numeric GID that MaraDNS will run as.
66 This accepts a single numerical value: The GID to run MaraDNS as.
68 -The default GID is 99.
69 +The default GID is 58.
72 \fBmaximum_cache_elements\fR
74 # The directory with all of the zone files
75 chroot_dir = "/etc/maradns"
76 # The numeric UID MaraDNS will run as
79 # The maximum number of threads (or processes, with the zone server)
80 # MaraDNS is allowed to run
82 diff -ur maradns-1.1.22.orig/doc/en/source/example_auth_mararc maradns-1.1.22/doc/en/source/example_auth_mararc
83 --- maradns-1.1.22.orig/doc/en/source/example_auth_mararc Thu Apr 4 02:16:54 2002
84 +++ maradns-1.1.22/doc/en/source/example_auth_mararc Mon Aug 23 12:54:02 2004
86 # The directory with all of the zone files
87 chroot_dir = "/etc/maradns"
88 # The numeric UID MaraDNS will run as
91 # The maximum number of processes the zone server is allowed to run
94 diff -ur maradns-1.1.22.orig/doc/en/source/example_full_mararc maradns-1.1.22/doc/en/source/example_full_mararc
95 --- maradns-1.1.22.orig/doc/en/source/example_full_mararc Mon Nov 18 10:02:36 2002
96 +++ maradns-1.1.22/doc/en/source/example_full_mararc Mon Aug 23 12:54:24 2004
98 # The directory with all of the zone files
99 chroot_dir = "/etc/maradns"
100 # The numeric UID MaraDNS will run as
103 # The (optional) numeric GID MaraDNS will run as
106 # The maximum number of threads (or processes, with the zone server)
107 # MaraDNS is allowed to run
109 diff -ur maradns-1.1.22.orig/doc/en/source/example_mararc maradns-1.1.22/doc/en/source/example_mararc
110 --- maradns-1.1.22.orig/doc/en/source/example_mararc Mon Nov 18 10:02:36 2002
111 +++ maradns-1.1.22/doc/en/source/example_mararc Mon Aug 23 12:53:57 2004
113 # The directory with all of the zone files
114 chroot_dir = "/etc/maradns"
115 # The numeric UID MaraDNS will run as
118 # The maximum number of threads (or processes, with the zone server)
119 # MaraDNS is allowed to run
121 diff -ur maradns-1.1.22.orig/doc/en/source/example_recursive_mararc maradns-1.1.22/doc/en/source/example_recursive_mararc
122 --- maradns-1.1.22.orig/doc/en/source/example_recursive_mararc Mon Nov 18 10:02:36 2002
123 +++ maradns-1.1.22/doc/en/source/example_recursive_mararc Mon Aug 23 12:53:50 2004
125 # The directory with all of the zone files
126 chroot_dir = "/etc/maradns"
127 # The numeric UID MaraDNS will run as
130 # The maximum number of threads (or processes, with the zone server)
131 # MaraDNS is allowed to run
133 diff -ur maradns-1.1.22.orig/doc/en/source/mararc.ej maradns-1.1.22/doc/en/source/mararc.ej
134 --- maradns-1.1.22.orig/doc/en/source/mararc.ej Mon Jun 21 21:49:41 2004
135 +++ maradns-1.1.22/doc/en/source/mararc.ej Mon Aug 23 12:56:48 2004
137 damage a potential attacker can cause should there be a security
138 problem with MaraDNS. This is the UID maradns becomes.
140 -The default UID is 99.
141 +The default UID is 58.
144 maradns_gid: The numeric GID that MaraDNS will run as.
146 This accepts a single numerical value: The GID to run MaraDNS as.
149 -The default GID is 99.
150 +The default GID is 58.
152 <h2>maximum_cache_elements</h2>
153 maximum_cache_elements: The maximum number of elements we can have
154 diff -ur maradns-1.1.22.orig/doc/en/tutorial/man.mararc.html maradns-1.1.22/doc/en/tutorial/man.mararc.html
155 --- maradns-1.1.22.orig/doc/en/tutorial/man.mararc.html Fri Jan 10 22:53:03 2003
156 +++ maradns-1.1.22/doc/en/tutorial/man.mararc.html Mon Aug 23 12:57:17 2004
158 damage a potential attacker can cause should there be a security
159 problem with MaraDNS. This is the UID maradns becomes.
161 -The default UID is 99.
162 +The default UID is 58.
165 maradns_gid: The numeric GID that MaraDNS will run as.
167 This accepts a single numerical value: The GID to run MaraDNS as.
170 -The default GID is 99.
171 +The default GID is 58.
173 <h2>maximum_cache_elements</h2>
174 maximum_cache_elements: The maximum number of elements we can have
176 # The directory with all of the zone files
177 chroot_dir = "/etc/maradns"
178 # The numeric UID MaraDNS will run as
181 # The maximum number of threads (or processes, with the zone server)
182 # MaraDNS is allowed to run
184 diff -ur maradns-1.1.22.orig/doc/fr/examples/example_mararc maradns-1.1.22/doc/fr/examples/example_mararc
185 --- maradns-1.1.22.orig/doc/fr/examples/example_mararc Thu Oct 24 18:16:19 2002
186 +++ maradns-1.1.22/doc/fr/examples/example_mararc Mon Aug 23 12:56:41 2004
188 # The directory with all of the zone files
189 chroot_dir = "/etc/maradns"
190 # The numeric UID MaraDNS will run as
193 # The maximum number of processes MaraDNS is allowed to use
196 diff -ur maradns-1.1.22.orig/doc/fr/man/mararc.5 maradns-1.1.22/doc/fr/man/mararc.5
197 --- maradns-1.1.22.orig/doc/fr/man/mararc.5 Mon Nov 18 09:12:13 2002
198 +++ maradns-1.1.22/doc/fr/man/mararc.5 Mon Aug 23 12:58:52 2004
200 # The directory with all of the zone files
201 chroot_dir = "/etc/maradns"
202 # The numeric UID MaraDNS will run as
205 # The maximum number of processes MaraDNS is allowed to use
208 diff -ur maradns-1.1.22.orig/doc/fr/source/example_mararc maradns-1.1.22/doc/fr/source/example_mararc
209 --- maradns-1.1.22.orig/doc/fr/source/example_mararc Mon Nov 18 09:12:13 2002
210 +++ maradns-1.1.22/doc/fr/source/example_mararc Mon Aug 23 12:57:04 2004
212 # The directory with all of the zone files
213 chroot_dir = "/etc/maradns"
214 # The numeric UID MaraDNS will run as
217 # The maximum number of processes MaraDNS is allowed to use
220 diff -ur maradns-1.1.22.orig/doc/fr/tutorial/man.mararc.html maradns-1.1.22/doc/fr/tutorial/man.mararc.html
221 --- maradns-1.1.22.orig/doc/fr/tutorial/man.mararc.html Mon Nov 18 09:12:13 2002
222 +++ maradns-1.1.22/doc/fr/tutorial/man.mararc.html Mon Aug 23 13:00:06 2004
224 # The directory with all of the zone files
225 chroot_dir = "/etc/maradns"
226 # The numeric UID MaraDNS will run as
229 # The maximum number of processes MaraDNS is allowed to use
232 diff -ur maradns-1.1.22.orig/maragen/mararc.m4 maradns-1.1.22/maragen/mararc.m4
233 --- maradns-1.1.22.orig/maragen/mararc.m4 Thu Oct 24 18:16:19 2002
234 +++ maradns-1.1.22/maragen/mararc.m4 Mon Aug 23 12:48:37 2004
236 # The numeric UID MaraDNS will run as
238 # The (optional) numeric GID MaraDNS will run as
241 # The maximum number of threads (or processes, with the zone server)
242 # MaraDNS is allowed to run
244 diff -ur maradns-1.1.22.orig/parse/example_mararc maradns-1.1.22/parse/example_mararc
245 --- maradns-1.1.22.orig/parse/example_mararc Mon Nov 12 00:14:26 2001
246 +++ maradns-1.1.22/parse/example_mararc Mon Aug 23 12:48:31 2004
248 chroot_dir = "/var/maradns"
249 # chroot_dir = "/home/set/maradns/zone"
250 # The numeric UID MaraDNS will run as
253 # The maximum number of processes MaraDNS is allowed to use
256 diff -ur maradns-1.1.22.orig/server/MaraDNS.c maradns-1.1.22/server/MaraDNS.c
257 --- maradns-1.1.22.orig/server/MaraDNS.c Wed Jun 30 12:29:07 2004
258 +++ maradns-1.1.22/server/MaraDNS.c Mon Aug 23 12:48:38 2004
259 @@ -3437,7 +3437,7 @@
261 /* Drop the elevated privledges */
262 /* First, change the GID */
263 - gid = read_numeric_kvar("maradns_gid",99);
264 + gid = read_numeric_kvar("maradns_gid",58);
266 /* Drop all supplemental groups */
268 @@ -3446,7 +3446,7 @@
271 /* Next, change the UID */
272 - uid = read_numeric_kvar("maradns_uid",99);
273 + uid = read_numeric_kvar("maradns_uid",58);
275 harderror(L_BADUID); /* "maradns_uid is less than 10 or not a number.\nThis uid must have a value of 10 or more" */
277 diff -ur maradns-1.1.22.orig/sqa/dead_host_simulate.c maradns-1.1.22/sqa/dead_host_simulate.c
278 --- maradns-1.1.22.orig/sqa/dead_host_simulate.c Sun Jan 12 07:52:43 2003
279 +++ maradns-1.1.22/sqa/dead_host_simulate.c Mon Aug 23 12:49:30 2004
281 harderror("Binding problem--must be root");
283 /* Drop elevated privledges */
284 - if(setuid(99) != 0)
285 + if(setuid(58) != 0)
286 harderror("setuid failed");
288 /* Make sure they are dropped */
289 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc maradns-1.1.22/sqa/testbed/mararc
290 --- maradns-1.1.22.orig/sqa/testbed/mararc Wed Oct 17 02:44:46 2001
291 +++ maradns-1.1.22/sqa/testbed/mararc Mon Aug 23 13:01:31 2004
293 chroot_dir = "/var/maradns"
294 # chroot_dir = "/home/set/maradns/zone"
295 # The numeric UID MaraDNS will run as
298 # The maximum number of processes MaraDNS is allowed to use
301 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.1 maradns-1.1.22/sqa/testbed/mararc.1
302 --- maradns-1.1.22.orig/sqa/testbed/mararc.1 Sat Mar 2 10:56:16 2002
303 +++ maradns-1.1.22/sqa/testbed/mararc.1 Mon Aug 23 13:01:46 2004
305 chroot_dir = "/var/maradns"
306 # chroot_dir = "/home/set/maradns/zone"
307 # The numeric UID MaraDNS will run as
310 # The maximum number of processes MaraDNS is allowed to use
313 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.2 maradns-1.1.22/sqa/testbed/mararc.2
314 --- maradns-1.1.22.orig/sqa/testbed/mararc.2 Sat Mar 2 10:56:22 2002
315 +++ maradns-1.1.22/sqa/testbed/mararc.2 Mon Aug 23 13:01:28 2004
317 chroot_dir = "/var/maradns"
318 # chroot_dir = "/home/set/maradns/zone"
319 # The numeric UID MaraDNS will run as
322 # The maximum number of processes MaraDNS is allowed to use
325 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.4 maradns-1.1.22/sqa/testbed/mararc.4
326 --- maradns-1.1.22.orig/sqa/testbed/mararc.4 Sat Mar 2 10:56:30 2002
327 +++ maradns-1.1.22/sqa/testbed/mararc.4 Mon Aug 23 13:01:43 2004
329 chroot_dir = "/var/maradns"
330 # chroot_dir = "/home/set/maradns/zone"
331 # The numeric UID MaraDNS will run as
334 # The maximum number of processes MaraDNS is allowed to use
337 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.5 maradns-1.1.22/sqa/testbed/mararc.5
338 --- maradns-1.1.22.orig/sqa/testbed/mararc.5 Sat Mar 2 10:56:36 2002
339 +++ maradns-1.1.22/sqa/testbed/mararc.5 Mon Aug 23 13:01:24 2004
341 chroot_dir = "/var/maradns"
342 # chroot_dir = "/home/set/maradns/zone"
343 # The numeric UID MaraDNS will run as
346 # The maximum number of processes MaraDNS is allowed to use
349 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.6 maradns-1.1.22/sqa/testbed/mararc.6
350 --- maradns-1.1.22.orig/sqa/testbed/mararc.6 Sat Mar 2 10:56:43 2002
351 +++ maradns-1.1.22/sqa/testbed/mararc.6 Mon Aug 23 13:01:38 2004
353 chroot_dir = "/var/maradns"
354 # chroot_dir = "/home/set/maradns/zone"
355 # The numeric UID MaraDNS will run as
358 # The maximum number of processes MaraDNS is allowed to use
361 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.7 maradns-1.1.22/sqa/testbed/mararc.7
362 --- maradns-1.1.22.orig/sqa/testbed/mararc.7 Sat Mar 2 10:56:49 2002
363 +++ maradns-1.1.22/sqa/testbed/mararc.7 Mon Aug 23 13:01:21 2004
365 chroot_dir = "/var/maradns"
366 # chroot_dir = "/home/set/maradns/zone"
367 # The numeric UID MaraDNS will run as
370 # The maximum number of processes MaraDNS is allowed to use
373 diff -ur maradns-1.1.22.orig/sqa/testbed/mararc.8 maradns-1.1.22/sqa/testbed/mararc.8
374 --- maradns-1.1.22.orig/sqa/testbed/mararc.8 Thu Dec 26 03:21:01 2002
375 +++ maradns-1.1.22/sqa/testbed/mararc.8 Mon Aug 23 13:01:35 2004
377 chroot_dir = "/var/maradns"
378 # chroot_dir = "/home/set/maradns/zone"
379 # The numeric UID MaraDNS will run as
382 # The maximum number of processes MaraDNS is allowed to use
385 diff -ur maradns-1.1.22.orig/test/rtest.c maradns-1.1.22/test/rtest.c
386 --- maradns-1.1.22.orig/test/rtest.c Sun Jan 12 07:53:58 2003
387 +++ maradns-1.1.22/test/rtest.c Mon Aug 23 12:49:32 2004
389 harderror("Binding problem--must be root");
391 /* Drop elevated privledges */
392 - if(setuid(99) != 0)
393 + if(setuid(58) != 0)
394 harderror("setuid failed");
396 /* Make sure they are dropped */
397 diff -ur maradns-1.1.22.orig/test/test_zoneserver.c maradns-1.1.22/test/test_zoneserver.c
398 --- maradns-1.1.22.orig/test/test_zoneserver.c Sun Jan 12 07:54:20 2003
399 +++ maradns-1.1.22/test/test_zoneserver.c Mon Aug 23 12:48:36 2004
403 /* Drop root privledges */
404 - if(setuid(99) != 0) {
405 + if(setuid(58) != 0) {
406 printf("Could not drop root privledges\n");