-more libexec fixes

1 files changed, 8 insertions, 2 deletions

diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 0b8f47e6..aead2a43 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -428,8 +428,10 @@ test_icmp_server (struct GNUNET_SetupAutoContext *ac)
 {
   int hns;
   char *tmp;
+  char *binary;
 
   tmp = NULL;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
   hns =
       ((GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
@@ -437,8 +439,9 @@ test_icmp_server (struct GNUNET_SetupAutoContext *ac)
        (GNUNET_YES ==
         GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
        (GNUNET_YES ==
-        GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server")));
+        GNUNET_OS_check_helper_binary (binary)));
   GNUNET_free_non_null (tmp);
+  GNUNET_free (binary);
   if (hns)
      GNUNET_SCHEDULER_add_now (&reversal_test, ac);
   else
@@ -457,8 +460,10 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
   GtkToggleButton *button;
   int hnc;
   char *tmp;
+  char *binary;
 
   tmp = NULL;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
   hnc =
       ((GNUNET_OK ==
         GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "INTERNAL_ADDRESS",
@@ -466,8 +471,9 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
        (GNUNET_YES !=
         GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
        (GNUNET_YES ==
-        GNUNET_OS_check_helper_binary ("gnunet-helper-nat-client")));
+        GNUNET_OS_check_helper_binary (binary)));
   GNUNET_free_non_null (tmp);
+  GNUNET_free (binary);
   button =
       GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
                          ("GNUNET_setup_transport_icmp_client_enable_checkbutton"));