diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-09-24 20:33:43 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-09-24 20:33:43 +0000 |
| commit | e35797e3ca7ce8636289907ca4aa4e1a7c4cfd1f (patch) | |
| tree | 4662809abff09421cebacc6ddd3b3194b179c28d /src/arm | |
| parent | 474599b488b51b998464321ff25219d366b31e94 (diff) | |
fix #4672
Diffstat (limited to 'src/arm')
| -rw-r--r-- | src/arm/arm_api.c | 24 | ||||
| -rw-r--r-- | src/arm/gnunet-service-arm.c | 29 |
2 files changed, 30 insertions, 23 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 5c4a1c7941..20ba7f9af2 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 21fbdca43c..df426bb48d 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) { |