From e35797e3ca7ce8636289907ca4aa4e1a7c4cfd1f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 24 Sep 2016 20:33:43 +0000
Subject: fix #4672

---
 src/arm/arm_api.c            | 24 ++++++++++++------------
 src/arm/gnunet-service-arm.c | 29 ++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 5c4a1c794..20ba7f9af 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -597,22 +597,22 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
   char *lopostfix;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (h->cfg,
-                                             "arm",
-                                             "PREFIX",
-                                             &loprefix))
+      GNUNET_CONFIGURATION_get_value_filename (h->cfg,
+                                               "arm",
+                                               "PREFIX",
+                                               &loprefix))
     loprefix = GNUNET_strdup ("");
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (h->cfg,
-                                             "arm",
-                                             "OPTIONS",
-                                             &lopostfix))
+      GNUNET_CONFIGURATION_get_value_filename (h->cfg,
+                                               "arm",
+                                               "OPTIONS",
+                                               &lopostfix))
     lopostfix = GNUNET_strdup ("");
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (h->cfg,
-                                             "arm",
-                                             "BINARY",
-                                             &cbinary))
+      GNUNET_CONFIGURATION_get_value_filename (h->cfg,
+                                               "arm",
+                                               "BINARY",
+                                               &cbinary))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
                                "arm",
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 21fbdca43..df426bb48 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -444,16 +444,16 @@ start_process (struct ServiceList *sl,
 
   /* obtain configuration */
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             sl->name,
-                                             "PREFIX",
-                                             &loprefix))
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               sl->name,
+                                               "PREFIX",
+                                               &loprefix))
     loprefix = GNUNET_strdup (prefix_command);
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             sl->name,
-                                             "OPTIONS",
-                                             &options))
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               sl->name,
+                                               "OPTIONS",
+                                               &options))
     options = NULL;
 
   {
@@ -1482,15 +1482,22 @@ setup_service (void *cls,
   if (strcasecmp (section, "arm") == 0)
     return;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, section, "BINARY", &binary))
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               section,
+                                               "BINARY",
+                                               &binary))
   {
     /* not a service section */
     return;
   }
   if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg, section, "USER_SERVICE")) &&
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        section,
+                                        "USER_SERVICE")) &&
       (GNUNET_YES ==
-       GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "USER_SERVICE")))
+       GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                             section,
+                                             "USER_SERVICE")))
   {
     if (GNUNET_NO == start_user)
     {
-- 
cgit v1.2.3