[GNUnet-SVN] r26780 - gnunet/src/pt

[gnunet]

Author: cfuchs
Date: 2013-04-05 16:08:52 +0200 (Fri, 05 Apr 2013)
New Revision: 26780

Modified:
   gnunet/src/pt/test_gnunet_vpn.c
Log:
started making test_gnunet_vpn a bit less linux-only. does not work on 
windows yet, though due to permissions checking, see other commits!


Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2013-04-05 13:35:29 UTC (rev 26779)
+++ gnunet/src/pt/test_gnunet_vpn.c     2013-04-05 14:08:52 UTC (rev 26780)
@@ -399,6 +399,7 @@
   const char *bin;
   char *vpn_binary;
   char *exit_binary;
+  int ret=0;
 
 #ifndef MINGW
   if (0 != ACCESS ("/dev/net/tun", R_OK))
@@ -409,15 +410,17 @@
     return 0;
   }
 #endif
-  vpn_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
-  exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
-  if ((GNUNET_YES != GNUNET_OS_check_helper_binary (vpn_binary)) ||
-      (GNUNET_YES != GNUNET_OS_check_helper_binary (exit_binary)))
+  vpn_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn.exe");
+  exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit.exe");
+  fprintf (stderr,"%s\n", vpn_binary);
+  fprintf (stderr,"%s\n", exit_binary);
+  if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (vpn_binary))) ||
+      (GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (exit_binary))))
   {
     GNUNET_free (vpn_binary);
     GNUNET_free (exit_binary);
     fprintf (stderr,
-             "WARNING: gnunet-helper-{exit,vpn} binaries are not SUID, 
refusing to run test (as it would have to fail).\n");
+             "WARNING: gnunet-helper-{exit,vpn} binaries are not SUID, 
refusing to run test (as it would have to fail). %d\n", ret);
     return 0;
   }