-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

11 files changed, 144 insertions, 119 deletions

diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 48652173a..a7b9fdd70 100644
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,4 +1,4 @@
 [gns-helper-service-w32]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-gns-helper-service-w32
 PORT = 5353
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index f7682cda7..2e6a02b07 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,6 +1,6 @@
 [gns]
-AUTOSTART = @AUTOSTART@
-FORCESTART = YES
+START_ON_DEMAND = @START_ON_DEMAND@
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-gns
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
@@ -20,7 +20,7 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 1000
 # we will ask gnunet-service-dns to pass DNS queries to us. Otherwise,
 # we only answer GNS queries via the API (which itself may be
 # called via NSS or other mechanisms).
-INTERCEPT_DNS = YES
+INTERCEPT_DNS = NO
 
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
@@ -30,8 +30,8 @@ INTERCEPT_DNS = YES
 
 [gns-proxy]
 BINARY = gnunet-gns-proxy
-AUTOSTART = NO
-USER_SERVICE = YES
+START_ON_DEMAND = NO
+RUN_PER_USER = YES
 
 # Where is the certificate for the GNS proxy stored?
 PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem
@@ -40,8 +40,8 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 [dns2gns]
 BINARY = gnunet-dns2gns
-AUTOSTART = NO
-USER_SERVICE = YES
+START_ON_DEMAND = NO
+RUN_PER_USER = YES
 
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use
 OPTIONS = -d 8.8.8.8
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 8264bf715..0ec9209da 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -300,17 +300,21 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
  * Cancel pending lookup request
  *
  * @param lr the lookup request to cancel
+ * @return closure from the lookup result processor
  */
-void
+void *
 GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
 {
   struct GNUNET_GNS_Handle *handle = lr->gns_handle;
+  void *ret;
 
   GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
                                handle->lookup_tail,
                                lr);
   GNUNET_MQ_discard (lr->env);
+  ret = lr->proc_cls;
   GNUNET_free (lr);
+  return ret;
 }
 
 
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index b053aa0c1..825b51d06 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -317,10 +317,13 @@ GNUNET_GNS_lookup_with_tld (struct GNUNET_GNS_Handle *handle,
  * Cancel pending lookup request
  *
  * @param ltr the lookup request to cancel
+ * @return closure from the lookup result processor
  */
-void
+void *
 GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
 {
+  void *ret = ltr->lookup_proc_cls;
+  
   if (NULL != ltr->id_op)
   {
     GNUNET_IDENTITY_ego_lookup_cancel (ltr->id_op);
@@ -333,6 +336,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
   }
   GNUNET_free (ltr->name);
   GNUNET_free (ltr);
+  return ret;
 }
 
 /* end of gns_tld_api.c */
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 9a405c49b..d66f5c658 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2012-2014 GNUnet e.V.
+     Copyright (C) 2012-2018 GNUnet e.V.
 
      GNUnet is free software: you can redistribute it and/or modify it
      under the terms of the GNU Affero General Public License as published
@@ -46,14 +46,6 @@
 #include "gns.h"
 
 
-/**
- * FIXME: GnuTLS right now sometimes rejects valid certs, so as a
- * VERY temporary workaround we just WARN the user instead of 
- * dropping the page.  THIS SHOULD NOT BE USED IN PRODUCTION,
- * set to 1 in production!!! FIXME!!!
- */
-#define FIXED_CERT_VALIDATION_BUG 0
-
 
 /**
  * Default Socks5 listen port.
@@ -1079,10 +1071,8 @@ check_ssl_certificate (struct Socks5Request *s5r)
                     certdn,
                     name,
                     rc);
-#if FIXED_CERT_VALIDATION_BUG
         gnutls_x509_crt_deinit (x509_cert);
         return GNUNET_SYSERR;
-#endif
       }
     }
     else
@@ -1197,6 +1187,15 @@ curl_check_hdr (void *buffer,
                              s5r->domain);
           continue;
         }
+        else if ( ('.' == cookie_domain[0]) &&
+                  (0 == strcmp (&cookie_domain[1],
+                                s5r->leho)) )
+        {
+          offset += sprintf (new_cookie_hdr + offset,
+                             " domain=.%s;",
+                             s5r->domain);
+          continue;
+        }
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     _("Cookie domain `%s' supplied by server is invalid\n"),
                     tok);
@@ -1723,12 +1722,6 @@ con_val_iter (void *cls,
                          key)) &&
        (NULL != s5r->leho) )
     value = s5r->leho;
-  if (0 == strcasecmp (MHD_HTTP_HEADER_CONTENT_LENGTH,
-                       key))
-    return MHD_YES;
-  if (0 == strcasecmp (MHD_HTTP_HEADER_ACCEPT_ENCODING,
-                       key))
-    return MHD_YES;
   GNUNET_asprintf (&hdr,
                    "%s: %s",
                    key,
@@ -1955,7 +1948,7 @@ create_response (void *cls,
                         s5r);
       {
         const char *us;
-        long upload_size;
+        long upload_size = 0;
 
         us = MHD_lookup_connection_value (con,
                                           MHD_HEADER_KIND,
@@ -1996,7 +1989,8 @@ create_response (void *cls,
         us = MHD_lookup_connection_value (con,
                                           MHD_HEADER_KIND,
                                           MHD_HTTP_HEADER_CONTENT_LENGTH);
-        if ( (NULL != us) && (1 == sscanf (us,
+        if ( (NULL != us) &&
+             (1 == sscanf (us,
                            "%ld",
                            &upload_size)) &&
              (upload_size >= 0) )
@@ -2026,20 +2020,41 @@ create_response (void *cls,
       curl_easy_setopt (s5r->curl,
                         CURLOPT_CUSTOMREQUEST,
                         "OPTIONS");
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEFUNCTION,
+                        &curl_download_cb);
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEDATA,
+                        s5r);
+
     }
     else if (0 == strcasecmp (meth,
-                              MHD_HTTP_METHOD_GET))
+                              MHD_HTTP_METHOD_GET))
     {
       s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTPGET,
-                        1L);
+                        CURLOPT_HTTPGET,
+                        1L);
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_WRITEFUNCTION,
-                        &curl_download_cb);
+                        CURLOPT_WRITEFUNCTION,
+                        &curl_download_cb);
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_WRITEDATA,
-                        s5r);
+                        CURLOPT_WRITEDATA,
+                        s5r);
+    }
+    else if (0 == strcasecmp (meth,
+                              MHD_HTTP_METHOD_DELETE))
+    {
+      s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED;
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_CUSTOMREQUEST,
+                        "DELETE");
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEFUNCTION,
+                        &curl_download_cb);
+      curl_easy_setopt (s5r->curl,
+                        CURLOPT_WRITEDATA,
+                        s5r);
     }
     else
     {
@@ -2054,46 +2069,46 @@ create_response (void *cls,
     if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_0))
     {
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_1_0);
+                        CURLOPT_HTTP_VERSION,
+                        CURL_HTTP_VERSION_1_0);
     }
     else if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_1))
     {
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_1_1);
+                        CURLOPT_HTTP_VERSION,
+                        CURL_HTTP_VERSION_1_1);
     }
     else
     {
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_HTTP_VERSION,
-                        CURL_HTTP_VERSION_NONE);
+                        CURLOPT_HTTP_VERSION,
+                        CURL_HTTP_VERSION_NONE);
     }
 
     if (HTTPS_PORT == s5r->port)
     {
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_USE_SSL,
-                        CURLUSESSL_ALL);
+                        CURLOPT_USE_SSL,
+                        CURLUSESSL_ALL);
       if (NULL != s5r->dane_data)
         curl_easy_setopt (s5r->curl,
-                          CURLOPT_SSL_VERIFYPEER,
-                          0L);
+                          CURLOPT_SSL_VERIFYPEER,
+                          0L);
       else
         curl_easy_setopt (s5r->curl,
-                          CURLOPT_SSL_VERIFYPEER,
-                          1L);
+                          CURLOPT_SSL_VERIFYPEER,
+                          1L);
       /* Disable cURL checking the hostname, as we will check ourselves
          as only we have the domain name or the LEHO or the DANE record */
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_SSL_VERIFYHOST,
-                        0L);
+                        CURLOPT_SSL_VERIFYHOST,
+                        0L);
     }
     else
     {
       curl_easy_setopt (s5r->curl,
-                        CURLOPT_USE_SSL,
-                        CURLUSESSL_NONE);
+                        CURLOPT_USE_SSL,
+                        CURLUSESSL_NONE);
     }
 
     if (CURLM_OK !=
@@ -2121,14 +2136,14 @@ create_response (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Processing %u bytes UPLOAD\n",
-                (unsigned int) *upload_data_size);
+                (unsigned int) *upload_data_size);
 
     /* FIXME: This must be set or a header with Transfer-Encoding: chunked. Else
      * upload callback is not called!
      */
     curl_easy_setopt (s5r->curl,
-                      CURLOPT_POSTFIELDSIZE,
-                      *upload_data_size);
+                      CURLOPT_POSTFIELDSIZE,
+                      *upload_data_size);
 
     left = GNUNET_MIN (*upload_data_size,
                        sizeof (s5r->io_buf) - s5r->io_len);
@@ -2142,7 +2157,7 @@ create_response (void *cls,
     {
       s5r->curl_paused = GNUNET_NO;
       curl_easy_pause (s5r->curl,
-                       CURLPAUSE_CONT);
+                       CURLPAUSE_CONT);
     }
     return MHD_YES;
   }
@@ -2522,9 +2537,9 @@ load_file (const char* filename,
 
   if (GNUNET_OK !=
       GNUNET_DISK_file_size (filename,
-                             &fsize,
+                             &fsize,
                              GNUNET_YES,
-                             GNUNET_YES))
+                             GNUNET_YES))
     return NULL;
   if (fsize > MAX_PEM_SIZE)
     return NULL;
@@ -2557,7 +2572,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
   int ret;
 
   key_data.data = load_file (keyfile,
-                             &key_data.size);
+                             &key_data.size);
   if (NULL == key_data.data)
     return GNUNET_SYSERR;
   ret = gnutls_x509_privkey_import (key, &key_data,
@@ -2588,17 +2603,17 @@ load_cert_from_file (gnutls_x509_crt_t crt,
   int ret;
 
   cert_data.data = load_file (certfile,
-                              &cert_data.size);
+                              &cert_data.size);
   if (NULL == cert_data.data)
     return GNUNET_SYSERR;
   ret = gnutls_x509_crt_import (crt,
-                                &cert_data,
+                                &cert_data,
                                 GNUTLS_X509_FMT_PEM);
   if (GNUTLS_E_SUCCESS != ret)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Unable to import certificate from `%s'\n"),
-                certfile);
+                certfile);
   }
   GNUNET_free_non_null (cert_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
@@ -2629,26 +2644,26 @@ generate_gns_certificate (const char *name)
   GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_key (request, proxy_ca.key));
   pgc = GNUNET_new (struct ProxyGNSCertificate);
   gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_COUNTRY_NAME,
+                                 GNUTLS_OID_X520_COUNTRY_NAME,
                                  0,
-                                 "ZZ",
-                                 strlen ("ZZ"));
+                                 "ZZ",
+                                 strlen ("ZZ"));
   gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_ORGANIZATION_NAME,
+                                 GNUTLS_OID_X520_ORGANIZATION_NAME,
                                  0,
-                                 "GNU Name System",
-                                 strlen ("GNU Name System"));
+                                 "GNU Name System",
+                                 strlen ("GNU Name System"));
   gnutls_x509_crt_set_dn_by_oid (request,
-                                 GNUTLS_OID_X520_COMMON_NAME,
+                                 GNUTLS_OID_X520_COMMON_NAME,
                                  0,
-                                 name,
-                                 strlen (name));
+                                 name,
+                                 strlen (name));
   GNUNET_break (GNUTLS_E_SUCCESS ==
-                gnutls_x509_crt_set_version (request,
-                                             3));
+                gnutls_x509_crt_set_version (request,
+                                             3));
   gnutls_rnd (GNUTLS_RND_NONCE,
-              &serial,
-              sizeof (serial));
+              &serial,
+              sizeof (serial));
   gnutls_x509_crt_set_serial (request,
                               &serial,
                               sizeof (serial));
@@ -2663,20 +2678,20 @@ generate_gns_certificate (const char *name)
   gnutls_x509_crt_set_expiration_time (request,
                                        etime);
   gnutls_x509_crt_sign2 (request,
-                         proxy_ca.cert,
-                         proxy_ca.key,
-                         GNUTLS_DIG_SHA512,
-                         0);
+                         proxy_ca.cert,
+                         proxy_ca.key,
+                         GNUTLS_DIG_SHA512,
+                         0);
   key_buf_size = sizeof (pgc->key);
   cert_buf_size = sizeof (pgc->cert);
   gnutls_x509_crt_export (request,
-                          GNUTLS_X509_FMT_PEM,
+                          GNUTLS_X509_FMT_PEM,
                           pgc->cert,
-                          &cert_buf_size);
+                          &cert_buf_size);
   gnutls_x509_privkey_export (proxy_ca.key,
-                              GNUTLS_X509_FMT_PEM,
+                              GNUTLS_X509_FMT_PEM,
                               pgc->key,
-                              &key_buf_size);
+                              &key_buf_size);
   gnutls_x509_crt_deinit (request);
   return pgc;
 }
@@ -3120,7 +3135,7 @@ do_s5r_read (void *cls)
   tc = GNUNET_SCHEDULER_get_task_context ();
   if ( (NULL != tc->read_ready) &&
        (GNUNET_NETWORK_fdset_isset (tc->read_ready,
-                                    s5r->sock)) )
+                                    s5r->sock)) )
   {
     rlen = GNUNET_NETWORK_socket_recv (s5r->sock,
                                        &s5r->rbuf[s5r->rbuf_len],
@@ -3247,7 +3262,7 @@ do_s5r_read (void *cls)
                                           *dom_len);
             GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                         "Requested connection is to http%s://%s:%d\n",
-                        (HTTPS_PORT == s5r->port) ? "s" : "",
+                        (HTTPS_PORT == s5r->port) ? "s" : "",
                         s5r->domain,
                         ntohs (*port));
             s5r->state = SOCKS5_RESOLVING;
@@ -3319,21 +3334,21 @@ do_accept (void *cls)
     ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                             lsock,
                                             &do_accept,
-                                            lsock);
+                                            lsock);
   else if (lsock == lsock6)
     ltask6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                             lsock,
                                             &do_accept,
-                                            lsock);
+                                            lsock);
   else
     GNUNET_assert (0);
   s = GNUNET_NETWORK_socket_accept (lsock,
-                                    NULL,
-                                    NULL);
+                                    NULL,
+                                    NULL);
   if (NULL == s)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "accept");
+                         "accept");
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3347,7 +3362,7 @@ do_accept (void *cls)
   s5r->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                               s5r->sock,
                                               &do_s5r_read,
-                                              s5r);
+                                              s5r);
 }
 
 
@@ -3445,7 +3460,7 @@ bind_v4 ()
     return NULL;
   if (GNUNET_OK !=
       GNUNET_NETWORK_socket_bind (ls,
-                                  (const struct sockaddr *) &sa4,
+                                  (const struct sockaddr *) &sa4,
                                   sizeof (sa4)))
   {
     eno = errno;
@@ -3482,7 +3497,7 @@ bind_v6 ()
     return NULL;
   if (GNUNET_OK !=
       GNUNET_NETWORK_socket_bind (ls,
-                                  (const struct sockaddr *) &sa6,
+                                  (const struct sockaddr *) &sa6,
                                   sizeof (sa6)))
   {
     eno = errno;
@@ -3537,8 +3552,8 @@ run (void *cls,
     cafile = cafile_cfg;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Using `%s' as CA\n",
-              cafile);
+              "Using `%s' as CA\n",
+              cafile);
 
   gnutls_global_init ();
   gnutls_x509_crt_init (&proxy_ca.cert);
@@ -3678,19 +3693,19 @@ main (int argc,
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_uint16 ('p',
-                                 "port",
-                                 NULL,
-                                 gettext_noop ("listen on specified port (default: 7777)"),
-                                 &port),
+                                 "port",
+                                 NULL,
+                                 gettext_noop ("listen on specified port (default: 7777)"),
+                                 &port),
     GNUNET_GETOPT_option_string ('a',
                                  "authority",
                                  NULL,
                                  gettext_noop ("pem file to use as CA"),
                                  &cafile_opt),
     GNUNET_GETOPT_option_flag ('6',
-                               "disable-ivp6",
-                               gettext_noop ("disable use of IPv6"),
-                               &disable_v6),
+                               "disable-ivp6",
+                               gettext_noop ("disable use of IPv6"),
+                               &disable_v6),
 
     GNUNET_GETOPT_OPTION_END
   };
@@ -3701,7 +3716,7 @@ main (int argc,
 
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
+                                    &argc, &argv))
     return 2;
   GNUNET_log_setup ("gnunet-gns-proxy",
                     "WARNING",
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index ecf4d59f5..42f3e1514 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -103,7 +103,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
   unsigned int num_answers;
   unsigned int skip_answers;
   unsigned int skip_additional;
-  size_t off;
+  size_t off = 0;
 
   /* Put records in the DNS packet */
   num_answers = 0;
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 54c3cba23..67960ef97 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -2397,6 +2397,8 @@ handle_dht_response (void *cls,
                 "Received expired block from the DHT, will not cache it.\n");
     return;
   }
+  if (GNUNET_YES == disable_cache)
+    return;
   /* Cache well-formed blocks */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Caching response from the DHT in namecache\n");
@@ -2407,7 +2409,7 @@ handle_dht_response (void *cls,
                                                          co);
   GNUNET_CONTAINER_DLL_insert (co_head,
                                co_tail,
-                               co);
+                               co);  
 }
 
 
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index a7b842302..0d9d2b49a 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 PLUGINS =
 
 [gns]
 # PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 210159fc8..317477c80 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 PLUGINS =
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 875c0a5e3..51edd5a0c 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -13,7 +13,7 @@ WEAKRANDOM = YES
 HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 HIJACK_DNS = YES
 
@@ -22,7 +22,7 @@ PROXY_CACERT = proxy/test_cert.pem
 PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
 PROVIDE_EXIT = NO
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index 5bf6f8e63..374731377 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -1,13 +1,13 @@
 @INLINE@ test_gns_defaults.conf
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 HOSTNAME = localhost
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -54,12 +54,12 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
 [dns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey
 PRIVATE_ZONE = private
@@ -75,14 +75,14 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 PORT = 22371
-AUTOSTART = YES
+START_ON_DEMAND = YES
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES