moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly

5 files changed, 15 insertions, 16 deletions

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index a19a97cf3..bd909f938 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -200,10 +200,16 @@ do_shutdown (void *cls,
     GNUNET_IDENTITY_disconnect (identity);
     identity = NULL;
   }
-  GNUNET_GNS_disconnect (gns);
-  gns = NULL;
-  GNUNET_DNSSTUB_stop (dns_stub);
-  dns_stub = NULL;
+  if (NULL != gns)
+  {
+    GNUNET_GNS_disconnect (gns);
+    gns = NULL;
+  }
+  if (NULL != dns_stub)
+  {
+    GNUNET_DNSSTUB_stop (dns_stub);
+    dns_stub = NULL;
+  }
 }
 
 
@@ -448,9 +454,10 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
     strcpy (&name[name_len - strlen (fcfs_suffix)],
             ".gnu");
     use_gns = GNUNET_YES;
-  } else if ( (name_len > strlen (dns_suffix)) &&
-       (0 == strcasecmp (dns_suffix,
-                         &name[name_len - strlen (dns_suffix)])) )
+  }
+  else if ( (name_len > strlen (dns_suffix)) &&
+            (0 == strcasecmp (dns_suffix,
+                              &name[name_len - strlen (dns_suffix)])) )
   {
     /* replace ".zkey.eu" with ".zkey" */
     strcpy (&name[name_len - strlen (dns_suffix)],
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 219d82f8a..ea8c7c3fc 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -9,9 +9,6 @@ AUTOSTART = YES
 [transport]
 PLUGINS =
 
-[arm]
-DEFAULTSERVICES =
-
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 73a713413..eac9fee43 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -9,9 +9,6 @@ AUTOSTART = YES
 [transport]
 PLUGINS =
 
-[arm]
-DEFAULTSERVICES =
-
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index da6a1823a..973c0257e 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -5,7 +5,6 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics dns namestore gns
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index d1aef4ca7..77ee8fc18 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -33,7 +33,6 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
 PORT = 12366
 
 [transport-tcp]
@@ -59,7 +58,7 @@ AUTOSTART = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
+#PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey