1 files changed, 10 insertions, 2 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 6ed45d51..2bfc0b36 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -405,13 +405,17 @@ static void
 start_resolver (void *cls,
                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  char *binary;
+
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
     return;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   resolver =
     GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
                              NULL,NULL,
-                             "gnunet-service-resolver",
+                             binary,
                              "gnunet-service-resolver", NULL);
+  GNUNET_free (binary);
 }
 
 
@@ -426,15 +430,19 @@ static void
 start_namestore (void *cls,
                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  char *binary;
+
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
     return;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore");
   namestore =
     GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL,
                              NULL, NULL,
-                             "gnunet-service-namestore",
+                             binary,
                              "gnunet-service-namestore", NULL);
+  GNUNET_free (binary);
 }