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) | |
download | gnunet-e35797e3ca7ce8636289907ca4aa4e1a7c4cfd1f.tar.gz gnunet-e35797e3ca7ce8636289907ca4aa4e1a7c4cfd1f.zip |
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 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, | |||
597 | char *lopostfix; | 597 | char *lopostfix; |
598 | 598 | ||
599 | if (GNUNET_OK != | 599 | if (GNUNET_OK != |
600 | GNUNET_CONFIGURATION_get_value_string (h->cfg, | 600 | GNUNET_CONFIGURATION_get_value_filename (h->cfg, |
601 | "arm", | 601 | "arm", |
602 | "PREFIX", | 602 | "PREFIX", |
603 | &loprefix)) | 603 | &loprefix)) |
604 | loprefix = GNUNET_strdup (""); | 604 | loprefix = GNUNET_strdup (""); |
605 | if (GNUNET_OK != | 605 | if (GNUNET_OK != |
606 | GNUNET_CONFIGURATION_get_value_string (h->cfg, | 606 | GNUNET_CONFIGURATION_get_value_filename (h->cfg, |
607 | "arm", | 607 | "arm", |
608 | "OPTIONS", | 608 | "OPTIONS", |
609 | &lopostfix)) | 609 | &lopostfix)) |
610 | lopostfix = GNUNET_strdup (""); | 610 | lopostfix = GNUNET_strdup (""); |
611 | if (GNUNET_OK != | 611 | if (GNUNET_OK != |
612 | GNUNET_CONFIGURATION_get_value_string (h->cfg, | 612 | GNUNET_CONFIGURATION_get_value_filename (h->cfg, |
613 | "arm", | 613 | "arm", |
614 | "BINARY", | 614 | "BINARY", |
615 | &cbinary)) | 615 | &cbinary)) |
616 | { | 616 | { |
617 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, | 617 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING, |
618 | "arm", | 618 | "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, | |||
444 | 444 | ||
445 | /* obtain configuration */ | 445 | /* obtain configuration */ |
446 | if (GNUNET_OK != | 446 | if (GNUNET_OK != |
447 | GNUNET_CONFIGURATION_get_value_string (cfg, | 447 | GNUNET_CONFIGURATION_get_value_filename (cfg, |
448 | sl->name, | 448 | sl->name, |
449 | "PREFIX", | 449 | "PREFIX", |
450 | &loprefix)) | 450 | &loprefix)) |
451 | loprefix = GNUNET_strdup (prefix_command); | 451 | loprefix = GNUNET_strdup (prefix_command); |
452 | if (GNUNET_OK != | 452 | if (GNUNET_OK != |
453 | GNUNET_CONFIGURATION_get_value_string (cfg, | 453 | GNUNET_CONFIGURATION_get_value_filename (cfg, |
454 | sl->name, | 454 | sl->name, |
455 | "OPTIONS", | 455 | "OPTIONS", |
456 | &options)) | 456 | &options)) |
457 | options = NULL; | 457 | options = NULL; |
458 | 458 | ||
459 | { | 459 | { |
@@ -1482,15 +1482,22 @@ setup_service (void *cls, | |||
1482 | if (strcasecmp (section, "arm") == 0) | 1482 | if (strcasecmp (section, "arm") == 0) |
1483 | return; | 1483 | return; |
1484 | if (GNUNET_OK != | 1484 | if (GNUNET_OK != |
1485 | GNUNET_CONFIGURATION_get_value_string (cfg, section, "BINARY", &binary)) | 1485 | GNUNET_CONFIGURATION_get_value_filename (cfg, |
1486 | section, | ||
1487 | "BINARY", | ||
1488 | &binary)) | ||
1486 | { | 1489 | { |
1487 | /* not a service section */ | 1490 | /* not a service section */ |
1488 | return; | 1491 | return; |
1489 | } | 1492 | } |
1490 | if ((GNUNET_YES == | 1493 | if ((GNUNET_YES == |
1491 | GNUNET_CONFIGURATION_have_value (cfg, section, "USER_SERVICE")) && | 1494 | GNUNET_CONFIGURATION_have_value (cfg, |
1495 | section, | ||
1496 | "USER_SERVICE")) && | ||
1492 | (GNUNET_YES == | 1497 | (GNUNET_YES == |
1493 | GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "USER_SERVICE"))) | 1498 | GNUNET_CONFIGURATION_get_value_yesno (cfg, |
1499 | section, | ||
1500 | "USER_SERVICE"))) | ||
1494 | { | 1501 | { |
1495 | if (GNUNET_NO == start_user) | 1502 | if (GNUNET_NO == start_user) |
1496 | { | 1503 | { |