summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Fuchs <christian.fuchs@cfuchs.net>2013-04-05 14:08:52 +0000
committerChristian Fuchs <christian.fuchs@cfuchs.net>2013-04-05 14:08:52 +0000
commit203c31d7b090fbfec893aa7bc865ebd7ab2631bd (patch)
tree5dfb6219f1ec1f8f48f6a08b9a7f41f710569e44 /src
parent0eb4c43a7edec834ecff96dc3e7b43e2935e4b08 (diff)
started making test_gnunet_vpn a bit less linux-only. does not work on
windows yet, though due to permissions checking, see other commits!
Diffstat (limited to 'src')
-rw-r--r--src/pt/test_gnunet_vpn.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index c41ccb278..c50837459 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -399,6 +399,7 @@ main (int argc, char *const *argv)
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 @@ main (int argc, char *const *argv)
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;
}