-check for helpers in libexec

3 files changed, 27 insertions, 9 deletions

diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index aaa5f3dd1..5db14c56a 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1272,18 +1272,21 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   struct in_addr dns_exit4;
   struct in6_addr dns_exit6;
   char *dns_exit;
+  char *binary;
 
   cfg = cfg_;
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
   if (GNUNET_YES !=
-      GNUNET_OS_check_helper_binary ("gnunet-helper-dns"))
+      GNUNET_OS_check_helper_binary (binary))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("`%s' must be installed SUID, refusing to run\n"),
-                "gnunet-helper-dns");
+                binary);
     global_ret = 1;
+    GNUNET_free (binary);
     return;
   }
-
+  GNUNET_free (binary);
   stats = GNUNET_STATISTICS_create ("dns", cfg);
   nc = GNUNET_SERVER_notification_context_create (server, 1);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 545551411..4fcd2fd56 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -444,18 +444,21 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
+  char *binary;
 
   if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("gnunet-gns-proxy"))
   {
     fprintf (stderr, "Proxy binary not in PATH... skipping!\n");
     return 0;
   }
-
-  if (GNUNET_YES != GNUNET_OS_check_helper_binary ("gnunet-helper-dns"))
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
+  if (GNUNET_YES != GNUNET_OS_check_helper_binary (binary))
   {
     fprintf (stderr, "DNS helper binary has wrong permissions... skipping!\n");
+    GNUNET_free (binary);
     return 0;
   }
+    GNUNET_free (binary);
 
   GNUNET_CRYPTO_rsa_setup_hostkey ("test_gns_proxy.conf");
   
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 32283bad4..dd21f9dcd 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -501,6 +501,9 @@ int
 main (int argc, char *const *argv)
 {
   char *sbin_iptables;
+  char *bin_vpn;
+  char *bin_exit;
+  char *bin_dns;
   char *const iptables_args[] =
   {
     "iptables", "-t", "mangle", "-L", "-v", NULL
@@ -535,20 +538,29 @@ main (int argc, char *const *argv)
     return 0;
   }
 
+  bin_vpn = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
+  bin_exit = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
+  bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
   if ( (0 != geteuid ()) &&
        ( (GNUNET_YES !=
-          GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
+          GNUNET_OS_check_helper_binary (bin_vpn)) ||
          (GNUNET_YES !=
-          GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) ||
+          GNUNET_OS_check_helper_binary (bin_exit)) ||
          (GNUNET_YES !=
-          GNUNET_OS_check_helper_binary ("gnunet-helper-dns"))) )
-  {
+          GNUNET_OS_check_helper_binary (bin_dns))) )
+  {    
     fprintf (stderr,
              "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not SUID, refusing to run test (as it would have to fail).\n");
     fprintf (stderr,
              "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is problematic) or permissions (run 'make install' as root) to fix this!\n");
+    GNUNET_free (bin_vpn);    
+    GNUNET_free (bin_exit);
+    GNUNET_free (bin_dns);
     return 0;
   }
+  GNUNET_free (bin_vpn);    
+  GNUNET_free (bin_exit);
+  GNUNET_free (bin_dns);
   GNUNET_CRYPTO_rsa_setup_hostkey ("test_gns_vpn.conf");
   
   dest_ip = "169.254.86.1";