From 49fa68fc2e975313ec446bcd46867199d105bfab Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 17 Jun 2018 00:26:24 +0200
Subject: [PATCH] use sane default for DNS interception

---
 src/dns/gnunet-service-dns.c | 17 +++++++++++++----
 src/gns/gns.conf.in          |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index c191f0531..6b75fd0f4 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1097,7 +1097,10 @@ run (void *cls,
 
   helper_argv[0] = GNUNET_strdup ("gnunet-dns");
   if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IFNAME", &ifc_name))
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+					     "dns",
+					     "IFNAME",
+					     &ifc_name))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No entry 'IFNAME' in configuration!\n");
@@ -1106,7 +1109,9 @@ run (void *cls,
   }
   helper_argv[1] = ifc_name;
   if ( (GNUNET_SYSERR ==
-	GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV6ADDR",
+	GNUNET_CONFIGURATION_get_value_string (cfg,
+					       "dns",
+					       "IPV6ADDR",
 					       &ipv6addr)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1116,7 +1121,9 @@ run (void *cls,
   }
   helper_argv[2] = ipv6addr;
   if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV6PREFIX",
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+					     "dns",
+					     "IPV6PREFIX",
                                              &ipv6prefix))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1127,7 +1134,9 @@ run (void *cls,
   helper_argv[3] = ipv6prefix;
 
   if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg, "dns", "IPV4ADDR",
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+					     "dns",
+					     "IPV4ADDR",
                                              &ipv4addr))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index f7682cda7..de50d1047 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -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
 
-- 
2.25.1