-removing tons of options that should be dead

2 files changed, 1 insertions, 46 deletions

diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index be5ad8bcc..3bc5f652c 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,4 +1,5 @@
 [cadet]
+PREFIX = valgrind
 FORCESTART = YES
 AUTOSTART = @AUTOSTART@
 @JAVAPORT@PORT = 2096
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 78620993e..eb0e78b14 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -1,23 +1,14 @@
 [testbed]
-AUTOSTART = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 OVERLAY_TOPOLOGY = LINE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-FORCESTART = NO
-
-[resolver]
-AUTOSTART = NO
-
 [cadet]
 #BINARY = gnunet-service-cadet-enc
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-AUTOSTART = NO
 ACCEPT_FROM = 127.0.0.1;
 REFRESH_CONNECTION_TIME = 333 ms
 ID_ANNOUNCE_TIME = 5 s
@@ -31,7 +22,6 @@ DISABLE_TRY_CONNECT = YES
 REKEY_PERIOD = 2 s
 
 [dht]
-AUTOSTART = NO
 DISABLE_TRY_CONNECT = YES
 FORCE_NSE = 3
 
@@ -70,52 +60,16 @@ BLUETOOTH_QUOTA_IN = unlimited
 BLUETOOTH_QUOTA_OUT = unlimited
 
 [core]
-PORT = 12092
-AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
-[arm]
-PORT = 12366
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-cadet/
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 DISABLEV6 = YES
 USE_LOCALADDR = YES
 
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
 [peerinfo]
 NO_IO = YES
 
-[set]
-AUTOSTART = NO
-FORCESTART = NO