From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 6 Dec 2011 13:56:42 +0000 (+0000)
Subject: -preping arm for test by LRN
X-Git-Tag: initial-import-from-subversion-38251~15722
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e22f7eb50d960e9b67cbf782afb9fb833362072c;p=oweals%2Fgnunet.git

-preping arm for test by LRN
---

diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c
index 021baa673..c5a5fa56b 100644
--- a/src/arm/gnunet-service-arm_interceptor.c
+++ b/src/arm/gnunet-service-arm_interceptor.c
@@ -989,14 +989,15 @@ acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head,
                                serviceListeningInfoList_tail, sli);
-  use_lsocks = GNUNET_NO;
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_have_value (cfg, sli->serviceName,
-                                       "DISABLE_SOCKET_FORWARDING"))
-    use_lsocks =
-        GNUNET_CONFIGURATION_get_value_yesno (cfg, sli->serviceName,
-                                              "DISABLE_SOCKET_FORWARDING");
-  if (GNUNET_NO != use_lsocks)
+  use_lsocks = GNUNET_YES;
+  if ((GNUNET_YES ==
+       GNUNET_CONFIGURATION_have_value (cfg, "arm",
+					"ENABLE_INTERCEPTOR")) &&
+      (GNUNET_YES ==
+       GNUNET_CONFIGURATION_get_value_yesno (cfg, "arm",
+					     "ENABLE_INTERCEPTOR")) )
+    use_lsocks = GNUNET_NO;
+  if (GNUNET_YES != use_lsocks)
   {
     accept_and_forward (sli);
     return;