diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-03 13:19:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-03 13:19:52 +0000 |
commit | 29c724d2a7764f83fe846b418d09540348b86983 (patch) | |
tree | dafaff8e37ba51355b22b6f38d856ae49e145006 /contrib | |
parent | b303961f38c9b578f30248ee364ed4e5ffdcd06c (diff) | |
download | gnunet-29c724d2a7764f83fe846b418d09540348b86983.tar.gz gnunet-29c724d2a7764f83fe846b418d09540348b86983.zip |
implementing #1747
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am | 3 | ||||
-rw-r--r-- | contrib/defaults.conf | 505 | ||||
-rw-r--r-- | contrib/test_gnunet_prefix.c | 2 |
3 files changed, 2 insertions, 508 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 5efbe5a32..0ee7c4922 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -14,8 +14,7 @@ noinst_SCRIPTS = \ | |||
14 | gnunet_janitor.py | 14 | gnunet_janitor.py |
15 | 15 | ||
16 | dist_pkgdata_DATA = \ | 16 | dist_pkgdata_DATA = \ |
17 | gnunet-logo-color.png \ | 17 | gnunet-logo-color.png |
18 | defaults.conf | ||
19 | 18 | ||
20 | EXTRA_DIST = \ | 19 | EXTRA_DIST = \ |
21 | coverage.sh \ | 20 | coverage.sh \ |
diff --git a/contrib/defaults.conf b/contrib/defaults.conf deleted file mode 100644 index 25bbf539e..000000000 --- a/contrib/defaults.conf +++ /dev/null | |||
@@ -1,505 +0,0 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = ~/.gnunet/ | ||
3 | # SERVICEHOME = /var/lib/gnunet/ | ||
4 | # DEFAULTCONFIG = /etc/gnunet.conf | ||
5 | # If 'DEFAULTCONFIG' is not defined, the current | ||
6 | # configuration file is assumed to be the default, | ||
7 | # which is what we want by default... | ||
8 | |||
9 | [gnunetd] | ||
10 | HOSTKEY = $SERVICEHOME/.hostkey | ||
11 | |||
12 | [TESTING] | ||
13 | WEAKRANDOM = NO | ||
14 | # How long before failing a connection? | ||
15 | CONNECT_TIMEOUT = 30 | ||
16 | # How many connect attempts should we make? | ||
17 | CONNECT_ATTEMPTS = 3 | ||
18 | # How many connections can happen simultaneously? | ||
19 | MAX_OUTSTANDING_CONNECTIONS = 50 | ||
20 | |||
21 | # Should we clean up the files on peer group shutdown? | ||
22 | DELETE_FILES = YES | ||
23 | |||
24 | [client] | ||
25 | HOME = $SERVICEHOME | ||
26 | |||
27 | [nat] | ||
28 | # Are we behind NAT? | ||
29 | BEHIND_NAT = NO | ||
30 | |||
31 | # Is the NAT hole-punched? | ||
32 | PUNCHED_NAT = NO | ||
33 | |||
34 | # Enable UPNP by default? | ||
35 | ENABLE_UPNP = NO | ||
36 | |||
37 | # Use addresses from the local network interfaces (inluding loopback, but also others) | ||
38 | USE_LOCALADDR = YES | ||
39 | |||
40 | # Use address obtained from a DNS lookup of our hostname | ||
41 | USE_HOSTNAME = NO | ||
42 | |||
43 | # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) | ||
44 | # normal interface IP address for non-NATed peers; | ||
45 | # possibly auto-detected (using UPnP) if possible if not specified | ||
46 | # EXTERNAL_ADDRESS = | ||
47 | |||
48 | # Should we use ICMP-based NAT traversal to try connect to NATed peers | ||
49 | # or, if we are behind NAT, to allow connections to us? | ||
50 | ENABLE_ICMP_CLIENT = NO | ||
51 | ENABLE_ICMP_SERVER = NO | ||
52 | |||
53 | # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; | ||
54 | # normal interface IP address for non-NATed peers; | ||
55 | # likely auto-detected (via interface list) if not specified (!) | ||
56 | # INTERNAL_ADDRESS = | ||
57 | |||
58 | # Disable IPv6 support | ||
59 | DISABLEV6 = NO | ||
60 | |||
61 | # How often do we query the DNS resolver | ||
62 | # for our hostname (to get our own IP), in ms | ||
63 | HOSTNAME_DNS_FREQUENCY = 1200000 | ||
64 | |||
65 | # How often do we iterate over our | ||
66 | # network interfaces to check for changes | ||
67 | # in our IP address? in ms | ||
68 | IFC_SCAN_FREQUENCY = 3000000 | ||
69 | |||
70 | # How often do we query the DNS resolver | ||
71 | # for our hostname (to get our own IP), in ms | ||
72 | DYNDNS_FREQUENCY = 140000 | ||
73 | |||
74 | # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8) | ||
75 | RETURN_LOCAL_ADDRESSES = NO | ||
76 | |||
77 | [gnunet-nat-server] | ||
78 | HOSTNAME = gnunet.org | ||
79 | PORT = 5724 | ||
80 | |||
81 | [transport-tcp] | ||
82 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) | ||
83 | PORT = 2086 | ||
84 | ADVERTISED_PORT = 2086 | ||
85 | |||
86 | # Maximum number of open TCP connections allowed | ||
87 | MAX_CONNECTIONS = 128 | ||
88 | |||
89 | TIMEOUT = 5000 | ||
90 | |||
91 | # ACCEPT_FROM = | ||
92 | # ACCEPT_FROM6 = | ||
93 | # REJECT_FROM = | ||
94 | # REJECT_FROM6 = | ||
95 | # BINDTO = | ||
96 | |||
97 | MAX_CONNECTIONS = 128 | ||
98 | |||
99 | |||
100 | [transport-udp] | ||
101 | PORT = 2086 | ||
102 | #BROADCAST = YES | ||
103 | #BROADCAST_PORT = 20089 | ||
104 | #BROADCAST_INTERVAL = 30000 | ||
105 | |||
106 | |||
107 | MAX_BPS = 1000000 | ||
108 | |||
109 | |||
110 | [transport-http] | ||
111 | PORT = 1080 | ||
112 | MAX_CONNECTIONS = 128 | ||
113 | |||
114 | [transport-https] | ||
115 | PORT = 4433 | ||
116 | CRYPTO_INIT = NORMAL | ||
117 | KEY_FILE = https.key | ||
118 | CERT_FILE = https.cert | ||
119 | MAX_CONNECTIONS = 128 | ||
120 | |||
121 | |||
122 | [transport-wlan] | ||
123 | # Name of the interface in monitor mode (typically monX) | ||
124 | INTERFACE = mon0 | ||
125 | # Real hardware, no testing | ||
126 | TESTMODE = 0 | ||
127 | |||
128 | |||
129 | [arm] | ||
130 | PORT = 2087 | ||
131 | HOSTNAME = localhost | ||
132 | HOME = $SERVICEHOME | ||
133 | CONFIG = $DEFAULTCONFIG | ||
134 | BINARY = gnunet-service-arm | ||
135 | ACCEPT_FROM = 127.0.0.1; | ||
136 | ACCEPT_FROM6 = ::1; | ||
137 | DEFAULTSERVICES = topology hostlist | ||
138 | UNIXPATH = /tmp/gnunet-service-arm.sock | ||
139 | UNIX_MATCH_UID = YES | ||
140 | UNIX_MATCH_GID = YES | ||
141 | # GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs | ||
142 | # GLOBAL_PREFIX = | ||
143 | # USERNAME = | ||
144 | # MAXBUF = | ||
145 | # TIMEOUT = | ||
146 | # DISABLEV6 = | ||
147 | # BINDTO = | ||
148 | # REJECT_FROM = | ||
149 | # REJECT_FROM6 = | ||
150 | # PREFIX = | ||
151 | |||
152 | [statistics] | ||
153 | AUTOSTART = YES | ||
154 | PORT = 2088 | ||
155 | HOSTNAME = localhost | ||
156 | HOME = $SERVICEHOME | ||
157 | CONFIG = $DEFAULTCONFIG | ||
158 | BINARY = gnunet-service-statistics | ||
159 | ACCEPT_FROM = 127.0.0.1; | ||
160 | ACCEPT_FROM6 = ::1; | ||
161 | UNIXPATH = /tmp/gnunet-service-statistics.sock | ||
162 | UNIX_MATCH_UID = NO | ||
163 | UNIX_MATCH_GID = YES | ||
164 | # DISABLE_SOCKET_FORWARDING = NO | ||
165 | # USERNAME = | ||
166 | # MAXBUF = | ||
167 | # TIMEOUT = | ||
168 | # DISABLEV6 = | ||
169 | # BINDTO = | ||
170 | # REJECT_FROM = | ||
171 | # REJECT_FROM6 = | ||
172 | # PREFIX = | ||
173 | |||
174 | [resolver] | ||
175 | AUTOSTART = YES | ||
176 | PORT = 2089 | ||
177 | HOSTNAME = localhost | ||
178 | HOME = $SERVICEHOME | ||
179 | CONFIG = $DEFAULTCONFIG | ||
180 | BINARY = gnunet-service-resolver | ||
181 | ACCEPT_FROM = 127.0.0.1; | ||
182 | ACCEPT_FROM6 = ::1; | ||
183 | UNIXPATH = /tmp/gnunet-service-resolver.sock | ||
184 | UNIX_MATCH_UID = NO | ||
185 | UNIX_MATCH_GID = NO | ||
186 | # DISABLE_SOCKET_FORWARDING = NO | ||
187 | # USERNAME = | ||
188 | # MAXBUF = | ||
189 | # TIMEOUT = | ||
190 | # DISABLEV6 = | ||
191 | # BINDTO = | ||
192 | # REJECT_FROM = | ||
193 | # REJECT_FROM6 = | ||
194 | # PREFIX = | ||
195 | |||
196 | [peerinfo] | ||
197 | AUTOSTART = YES | ||
198 | PORT = 2090 | ||
199 | HOSTNAME = localhost | ||
200 | HOME = $SERVICEHOME | ||
201 | CONFIG = $DEFAULTCONFIG | ||
202 | BINARY = gnunet-service-peerinfo | ||
203 | ACCEPT_FROM = 127.0.0.1; | ||
204 | ACCEPT_FROM6 = ::1; | ||
205 | UNIXPATH = /tmp/gnunet-service-peerinfo.sock | ||
206 | UNIX_MATCH_UID = NO | ||
207 | UNIX_MATCH_GID = YES | ||
208 | # DISABLE_SOCKET_FORWARDING = NO | ||
209 | # USERNAME = | ||
210 | # MAXBUF = | ||
211 | # TIMEOUT = | ||
212 | # DISABLEV6 = | ||
213 | # BINDTO = | ||
214 | # REJECT_FROM = | ||
215 | # REJECT_FROM6 = | ||
216 | # PREFIX = | ||
217 | HOSTS = $SERVICEHOME/data/hosts/ | ||
218 | |||
219 | |||
220 | [transport] | ||
221 | AUTOSTART = YES | ||
222 | PORT = 2091 | ||
223 | HOSTNAME = localhost | ||
224 | HOME = $SERVICEHOME | ||
225 | CONFIG = $DEFAULTCONFIG | ||
226 | BINARY = gnunet-service-transport | ||
227 | #PREFIX = valgrind | ||
228 | NEIGHBOUR_LIMIT = 50 | ||
229 | ACCEPT_FROM = 127.0.0.1; | ||
230 | ACCEPT_FROM6 = ::1; | ||
231 | PLUGINS = tcp | ||
232 | UNIXPATH = /tmp/gnunet-service-transport.sock | ||
233 | BLACKLIST_FILE = $SERVICEHOME/blacklist | ||
234 | UNIX_MATCH_UID = YES | ||
235 | UNIX_MATCH_GID = YES | ||
236 | # DISABLE_SOCKET_FORWARDING = NO | ||
237 | # USERNAME = | ||
238 | # MAXBUF = | ||
239 | # TIMEOUT = | ||
240 | # DISABLEV6 = | ||
241 | # BINDTO = | ||
242 | # REJECT_FROM = | ||
243 | # REJECT_FROM6 = | ||
244 | # PREFIX = | ||
245 | |||
246 | [ats] | ||
247 | AUTOSTART = YES | ||
248 | PORT = 2098 | ||
249 | HOSTNAME = localhost | ||
250 | HOME = $SERVICEHOME | ||
251 | CONFIG = $DEFAULTCONFIG | ||
252 | BINARY = gnunet-service-ats | ||
253 | ACCEPT_FROM = 127.0.0.1; | ||
254 | ACCEPT_FROM6 = ::1; | ||
255 | UNIXPATH = /tmp/gnunet-service-ats.sock | ||
256 | UNIX_MATCH_UID = YES | ||
257 | UNIX_MATCH_GID = YES | ||
258 | |||
259 | TOTAL_QUOTA_IN = 65536 | ||
260 | TOTAL_QUOTA_OUT = 65536 | ||
261 | # ATS options | ||
262 | DUMP_MLP = NO | ||
263 | DUMP_SOLUTION = NO | ||
264 | DUMP_OVERWRITE = NO | ||
265 | DUMP_MIN_PEERS = 0 | ||
266 | DUMP_MIN_ADDRS = 0 | ||
267 | DUMP_OVERWRITE = NO | ||
268 | ATS_MIN_INTERVAL = 15000 | ||
269 | ATS_EXEC_INTERVAL = 30000 | ||
270 | |||
271 | |||
272 | [core] | ||
273 | AUTOSTART = YES | ||
274 | PORT = 2092 | ||
275 | HOSTNAME = localhost | ||
276 | HOME = $SERVICEHOME | ||
277 | CONFIG = $DEFAULTCONFIG | ||
278 | BINARY = gnunet-service-core | ||
279 | ACCEPT_FROM = 127.0.0.1; | ||
280 | ACCEPT_FROM6 = ::1; | ||
281 | # quotas are in bytes per second now! | ||
282 | TOTAL_QUOTA_IN = 65536 | ||
283 | TOTAL_QUOTA_OUT = 65536 | ||
284 | UNIXPATH = /tmp/gnunet-service-core.sock | ||
285 | UNIX_MATCH_UID = YES | ||
286 | UNIX_MATCH_GID = YES | ||
287 | # DISABLE_SOCKET_FORWARDING = NO | ||
288 | # DEBUG = YES | ||
289 | # USERNAME = | ||
290 | # MAXBUF = | ||
291 | # TIMEOUT = | ||
292 | # DISABLEV6 = | ||
293 | # BINDTO = | ||
294 | # REJECT_FROM = | ||
295 | # REJECT_FROM6 = | ||
296 | # PREFIX = | ||
297 | |||
298 | |||
299 | [topology] | ||
300 | MINIMUM-FRIENDS = 0 | ||
301 | FRIENDS-ONLY = NO | ||
302 | AUTOCONNECT = YES | ||
303 | TARGET-CONNECTION-COUNT = 16 | ||
304 | FRIENDS = $SERVICEHOME/friends | ||
305 | CONFIG = $DEFAULTCONFIG | ||
306 | BINARY = gnunet-daemon-topology | ||
307 | |||
308 | [hostlist] | ||
309 | # port for hostlist http server | ||
310 | HTTPPORT = 8080 | ||
311 | HOME = $SERVICEHOME | ||
312 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | ||
313 | CONFIG = $DEFAULTCONFIG | ||
314 | BINARY = gnunet-daemon-hostlist | ||
315 | # consider having "-e" as default as well once implemented | ||
316 | OPTIONS = -b | ||
317 | SERVERS = http://v9.gnunet.org:58080/ | ||
318 | # proxy for downloading hostlists | ||
319 | HTTP-PROXY = | ||
320 | |||
321 | |||
322 | [datastore] | ||
323 | AUTOSTART = YES | ||
324 | UNIXPATH = /tmp/gnunet-service-datastore.sock | ||
325 | UNIX_MATCH_UID = YES | ||
326 | UNIX_MATCH_GID = YES | ||
327 | PORT = 2093 | ||
328 | HOSTNAME = localhost | ||
329 | HOME = $SERVICEHOME | ||
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-datastore | ||
332 | ACCEPT_FROM = 127.0.0.1; | ||
333 | ACCEPT_FROM6 = ::1; | ||
334 | QUOTA = 100000000 | ||
335 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | ||
336 | DATABASE = sqlite | ||
337 | # DISABLE_SOCKET_FORWARDING = NO | ||
338 | |||
339 | [datastore-sqlite] | ||
340 | FILENAME = $SERVICEHOME/datastore/sqlite.db | ||
341 | |||
342 | [datastore-postgres] | ||
343 | CONFIG = connect_timeout=10; dbname=gnunet | ||
344 | |||
345 | [datastore-mysql] | ||
346 | DATABASE = gnunet | ||
347 | CONFIG = ~/.my.cnf | ||
348 | # USER = gnunet | ||
349 | # PASSWORD = | ||
350 | # HOST = localhost | ||
351 | # PORT = 3306 | ||
352 | |||
353 | [datacache-mysql] | ||
354 | DATABASE = gnunetcheck | ||
355 | CONFIG = ~/.my.cnf | ||
356 | # USER = gnunet | ||
357 | # PASSWORD = | ||
358 | # HOST = localhost | ||
359 | # PORT = 3306 | ||
360 | |||
361 | |||
362 | [fs] | ||
363 | AUTOSTART = YES | ||
364 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
365 | TRUST = $SERVICEHOME/data/credit/ | ||
366 | IDENTITY_DIR = $SERVICEHOME/identities/ | ||
367 | STATE_DIR = $SERVICEHOME/persistence/ | ||
368 | UPDATE_DIR = $SERVICEHOME/updates/ | ||
369 | PORT = 2094 | ||
370 | HOSTNAME = localhost | ||
371 | HOME = $SERVICEHOME | ||
372 | CONFIG = $DEFAULTCONFIG | ||
373 | BINARY = gnunet-service-fs | ||
374 | ACCEPT_FROM = 127.0.0.1; | ||
375 | ACCEPT_FROM6 = ::1; | ||
376 | |||
377 | DELAY = YES | ||
378 | CONTENT_CACHING = YES | ||
379 | CONTENT_PUSHING = YES | ||
380 | |||
381 | UNIXPATH = /tmp/gnunet-service-fs.sock | ||
382 | UNIX_MATCH_UID = NO | ||
383 | UNIX_MATCH_GID = YES | ||
384 | # DISABLE_SOCKET_FORWARDING = NO | ||
385 | # DEBUG = YES | ||
386 | MAX_PENDING_REQUESTS = 65536 | ||
387 | # Maximum frequency we're allowed to poll the datastore | ||
388 | # for content for migration (can be used to reduce | ||
389 | # GNUnet's disk-IO rate) | ||
390 | MIN_MIGRATION_DELAY = 100 | ||
391 | EXPECTED_NEIGHBOUR_COUNT = 128 | ||
392 | |||
393 | [dht] | ||
394 | AUTOSTART = YES | ||
395 | PORT = 2095 | ||
396 | HOSTNAME = localhost | ||
397 | HOME = $SERVICEHOME | ||
398 | CONFIG = $DEFAULTCONFIG | ||
399 | BINARY = gnunet-service-dht | ||
400 | ACCEPT_FROM = 127.0.0.1; | ||
401 | ACCEPT_FROM6 = ::1; | ||
402 | BUCKET_SIZE = 4 | ||
403 | UNIXPATH = /tmp/gnunet-service-dht.sock | ||
404 | UNIX_MATCH_UID = YES | ||
405 | UNIX_MATCH_GID = YES | ||
406 | # DISABLE_SOCKET_FORWARDING = NO | ||
407 | # DEBUG = YES | ||
408 | # USERNAME = | ||
409 | # MAXBUF = | ||
410 | # TIMEOUT = | ||
411 | # DISABLEV6 = | ||
412 | # BINDTO = | ||
413 | # REJECT_FROM = | ||
414 | # REJECT_FROM6 = | ||
415 | # PREFIX = | ||
416 | # DO_FIND_PEER = | ||
417 | # STRICT_KADEMLIA = | ||
418 | # USE_MAX_HOPS = | ||
419 | # MAX_HOPS = | ||
420 | # REPUBLISH = YES | ||
421 | # REPLICATION_FREQUENCY = 60 | ||
422 | # STOP_ON_CLOSEST = | ||
423 | # STOP_FOUND = | ||
424 | # CONVERGE_MODIFIER = | ||
425 | |||
426 | |||
427 | [dhtcache] | ||
428 | DATABASE = sqlite | ||
429 | QUOTA = 1024000 | ||
430 | |||
431 | [block] | ||
432 | PLUGINS = fs dht test dns | ||
433 | |||
434 | [mesh] | ||
435 | AUTOSTART = YES | ||
436 | PORT = 2096 | ||
437 | HOSTNAME = localhost | ||
438 | HOME = $SERVICEHOME | ||
439 | CONFIG = $DEFAULTCONFIG | ||
440 | BINARY = gnunet-service-mesh | ||
441 | ACCEPT_FROM = 127.0.0.1; | ||
442 | ACCEPT_FROM6 = ::1; | ||
443 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
444 | UNIX_MATCH_UID = YES | ||
445 | UNIX_MATCH_GID = YES | ||
446 | |||
447 | [nse] | ||
448 | AUTOSTART = YES | ||
449 | PORT = 2097 | ||
450 | HOSTNAME = localhost | ||
451 | HOME = $SERVICEHOME | ||
452 | CONFIG = $DEFAULTCONFIG | ||
453 | BINARY = gnunet-service-nse | ||
454 | ACCEPT_FROM = 127.0.0.1; | ||
455 | ACCEPT_FROM6 = ::1; | ||
456 | UNIXPATH = /tmp/test-nse-service-nse.unix | ||
457 | UNIX_MATCH_UID = YES | ||
458 | UNIX_MATCH_GID = YES | ||
459 | PROOFFILE = $SERVICEHOME/.nse-proof | ||
460 | HISTOGRAM = $SERVICEHOME/nse-history.log | ||
461 | |||
462 | # How 'slowly' should the proof-of-work be constructed (delay | ||
463 | # between rounds in ms); sane values between 0 and ~1000. | ||
464 | WORKDELAY = 5 | ||
465 | |||
466 | # Note: changing any of the values below will make this peer | ||
467 | # completely incompatible with other peers! | ||
468 | INTERVAL = 3600000 | ||
469 | WORKBITS = 20 | ||
470 | |||
471 | |||
472 | [vpn] | ||
473 | CONFIG = $DEFAULTCONFIG | ||
474 | BINARY = gnunet-daemon-vpn | ||
475 | IPV6ADDR = 1234::1 | ||
476 | IPV6PREFIX = 32 | ||
477 | IPV4ADDR = 10.11.10.1 | ||
478 | IPV4MASK = 255.255.0.0 | ||
479 | VIRTDNS = 10.11.10.2 | ||
480 | VIRTDNS6 = 1234::17 | ||
481 | IFNAME = vpn-gnunet | ||
482 | |||
483 | [exit] | ||
484 | CONFIG = $DEFAULTCONFIG | ||
485 | BINARY = gnunet-daemon-exit | ||
486 | IPV6ADDR = 1234:1::1 | ||
487 | IPV6PREFIX = 32 | ||
488 | IPV4ADDR = 10.10.1.1 | ||
489 | IPV4MASK = 255.255.0.0 | ||
490 | IFNAME = exit-gnunet | ||
491 | ENABLE_UDP = NO | ||
492 | ENABLE_TCP = NO | ||
493 | |||
494 | [dns] | ||
495 | AUTOSTART = YES | ||
496 | PORT = 0 | ||
497 | HOSTNAME = localhost | ||
498 | HOME = $SERVICEHOME | ||
499 | CONFIG = $DEFAULTCONFIG | ||
500 | BINARY = gnunet-service-dns | ||
501 | ACCEPT_FROM = 127.0.0.1; | ||
502 | ACCEPT_FROM6 = ::1; | ||
503 | UNIXPATH = /tmp/gnunet-service-dns.sock | ||
504 | PROVIDE_EXIT = NO | ||
505 | |||
diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c index ea8137107..732e8ebac 100644 --- a/contrib/test_gnunet_prefix.c +++ b/contrib/test_gnunet_prefix.c | |||
@@ -43,7 +43,7 @@ main (int argc, | |||
43 | _("Testcases will not work!\n")); | 43 | _("Testcases will not work!\n")); |
44 | return 1; | 44 | return 1; |
45 | } | 45 | } |
46 | dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "defaults.conf"; | 46 | dirname = DIR_SEPARATOR_STR "share" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR "config.d"; |
47 | { | 47 | { |
48 | char tmp[strlen (basename) + strlen (dirname) + 1]; | 48 | char tmp[strlen (basename) + strlen (dirname) + 1]; |
49 | sprintf (tmp, "%s%s", basename, dirname); | 49 | sprintf (tmp, "%s%s", basename, dirname); |