diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-04-15 15:00:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-04-15 15:00:53 +0000 |
commit | 8a6448fb4f4dbfab07995028ce8f2516c563cac3 (patch) | |
tree | b73a10218990841af0d58f2e433752f8092c4aec /src | |
parent | 4e668e13d72a1fc55abfe69578c0486fdf02cd78 (diff) | |
download | gnunet-8a6448fb4f4dbfab07995028ce8f2516c563cac3.tar.gz gnunet-8a6448fb4f4dbfab07995028ce8f2516c563cac3.zip |
-no boolean
Diffstat (limited to 'src')
-rw-r--r-- | src/dns/gnunet-service-dns.c | 2 | ||||
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 4 | ||||
-rw-r--r-- | src/nat/nat.c | 4 | ||||
-rw-r--r-- | src/nat/nat_auto.c | 6 | ||||
-rw-r--r-- | src/nat/nat_mini.c | 4 | ||||
-rw-r--r-- | src/nat/test_nat_test.c | 2 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 6 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 2 | ||||
-rw-r--r-- | src/util/os_priority.c | 6 | ||||
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 2 |
12 files changed, 22 insertions, 22 deletions
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index a2d5354de..b7ecee0d7 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -1043,7 +1043,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1043 | cfg = cfg_; | 1043 | cfg = cfg_; |
1044 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); | 1044 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); |
1045 | if (GNUNET_YES != | 1045 | if (GNUNET_YES != |
1046 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL)) | 1046 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) |
1047 | { | 1047 | { |
1048 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1048 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1049 | _("`%s' must be installed SUID, refusing to run\n"), | 1049 | _("`%s' must be installed SUID, refusing to run\n"), |
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index 2c5bb1ecd..20f240b0d 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -3344,7 +3344,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
3344 | { | 3344 | { |
3345 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit"); | 3345 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit"); |
3346 | if (GNUNET_YES != | 3346 | if (GNUNET_YES != |
3347 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL)) // FIXME: CF: add test-parameters | 3347 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) // FIXME: CF: add test-parameters |
3348 | { | 3348 | { |
3349 | GNUNET_free (binary); | 3349 | GNUNET_free (binary); |
3350 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3350 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 68830ca7f..3ec2bf95c 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -446,13 +446,13 @@ main (int argc, char *const *argv) | |||
446 | { | 446 | { |
447 | char *binary; | 447 | char *binary; |
448 | 448 | ||
449 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("gnunet-gns-proxy", FALSE, NULL)) | 449 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("gnunet-gns-proxy", GNUNET_NO, NULL)) |
450 | { | 450 | { |
451 | fprintf (stderr, "Proxy binary not in PATH... skipping!\n"); | 451 | fprintf (stderr, "Proxy binary not in PATH... skipping!\n"); |
452 | return 0; | 452 | return 0; |
453 | } | 453 | } |
454 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); | 454 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); |
455 | if (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, TRUE, NULL)) | 455 | if (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) |
456 | { | 456 | { |
457 | fprintf (stderr, "DNS helper binary has wrong permissions... skipping!\n"); | 457 | fprintf (stderr, "DNS helper binary has wrong permissions... skipping!\n"); |
458 | GNUNET_free (binary); | 458 | GNUNET_free (binary); |
diff --git a/src/nat/nat.c b/src/nat/nat.c index fd9d5eaa0..e1ec88028 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c | |||
@@ -1171,7 +1171,7 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp, | |||
1171 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server"); | 1171 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server"); |
1172 | if ((h->behind_nat == GNUNET_YES) && (GNUNET_YES == h->enable_nat_server) && | 1172 | if ((h->behind_nat == GNUNET_YES) && (GNUNET_YES == h->enable_nat_server) && |
1173 | (GNUNET_YES != | 1173 | (GNUNET_YES != |
1174 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL))) // FIXME: CF: add test-parameters | 1174 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))) // FIXME: CF: add test-parameters |
1175 | { | 1175 | { |
1176 | h->enable_nat_server = GNUNET_NO; | 1176 | h->enable_nat_server = GNUNET_NO; |
1177 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1177 | LOG (GNUNET_ERROR_TYPE_WARNING, |
@@ -1183,7 +1183,7 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp, | |||
1183 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client"); | 1183 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client"); |
1184 | if ((GNUNET_YES == h->enable_nat_client) && | 1184 | if ((GNUNET_YES == h->enable_nat_client) && |
1185 | (GNUNET_YES != | 1185 | (GNUNET_YES != |
1186 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL))) // FIXME: CF: add test-parameters | 1186 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))) // FIXME: CF: add test-parameters |
1187 | { | 1187 | { |
1188 | h->enable_nat_client = GNUNET_NO; | 1188 | h->enable_nat_client = GNUNET_NO; |
1189 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1189 | LOG (GNUNET_ERROR_TYPE_WARNING, |
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c index f382a9ac6..edb2bb841 100644 --- a/src/nat/nat_auto.c +++ b/src/nat/nat_auto.c | |||
@@ -392,7 +392,7 @@ test_upnpc (struct GNUNET_NAT_AutoHandle *ah) | |||
392 | 392 | ||
393 | /* test if upnpc is available */ | 393 | /* test if upnpc is available */ |
394 | have_upnpc = (GNUNET_SYSERR != | 394 | have_upnpc = (GNUNET_SYSERR != |
395 | GNUNET_OS_check_helper_binary ("upnpc", FALSE, NULL)); | 395 | GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL)); |
396 | /* FIXME: test if upnpc is actually working, that is, if transports | 396 | /* FIXME: test if upnpc is actually working, that is, if transports |
397 | start to work once we use UPnP */ | 397 | start to work once we use UPnP */ |
398 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 398 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
@@ -426,7 +426,7 @@ test_icmp_server (struct GNUNET_NAT_AutoHandle *ah) | |||
426 | (GNUNET_YES == | 426 | (GNUNET_YES == |
427 | GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && | 427 | GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && |
428 | (GNUNET_YES == | 428 | (GNUNET_YES == |
429 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL))); // FIXME: CF: add test-parameters | 429 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))); // FIXME: CF: add test-parameters |
430 | GNUNET_free_non_null (tmp); | 430 | GNUNET_free_non_null (tmp); |
431 | GNUNET_free (binary); | 431 | GNUNET_free (binary); |
432 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 432 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
@@ -461,7 +461,7 @@ test_icmp_client (struct GNUNET_NAT_AutoHandle *ah) | |||
461 | (GNUNET_YES != | 461 | (GNUNET_YES != |
462 | GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && | 462 | GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) && |
463 | (GNUNET_YES == | 463 | (GNUNET_YES == |
464 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL))); // FIXME: CF: add test-parameters | 464 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))); // FIXME: CF: add test-parameters |
465 | GNUNET_free_non_null (tmp); | 465 | GNUNET_free_non_null (tmp); |
466 | GNUNET_free (binary); | 466 | GNUNET_free (binary); |
467 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 467 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 29b26ee28..dd1aede5e 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -164,7 +164,7 @@ GNUNET_NAT_mini_get_external_ipv4 (struct GNUNET_TIME_Relative timeout, | |||
164 | { | 164 | { |
165 | struct GNUNET_NAT_ExternalHandle *eh; | 165 | struct GNUNET_NAT_ExternalHandle *eh; |
166 | 166 | ||
167 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip", FALSE, NULL)) | 167 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip", GNUNET_NO, NULL)) |
168 | { | 168 | { |
169 | LOG (GNUNET_ERROR_TYPE_INFO, | 169 | LOG (GNUNET_ERROR_TYPE_INFO, |
170 | _("`external-ip' command not found\n")); | 170 | _("`external-ip' command not found\n")); |
@@ -499,7 +499,7 @@ GNUNET_NAT_mini_map_start (uint16_t port, int is_tcp, | |||
499 | struct GNUNET_NAT_MiniHandle *ret; | 499 | struct GNUNET_NAT_MiniHandle *ret; |
500 | char pstr[6]; | 500 | char pstr[6]; |
501 | 501 | ||
502 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc", FALSE, NULL)) | 502 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL)) |
503 | { | 503 | { |
504 | LOG (GNUNET_ERROR_TYPE_INFO, | 504 | LOG (GNUNET_ERROR_TYPE_INFO, |
505 | _("`upnpc' command not found\n")); | 505 | _("`upnpc' command not found\n")); |
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 7d4964b5c..41d3a2f09 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c | |||
@@ -92,7 +92,7 @@ main (int argc, char *const argv[]) | |||
92 | "WARNING", | 92 | "WARNING", |
93 | NULL); | 93 | NULL); |
94 | 94 | ||
95 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", FALSE, NULL); | 95 | nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", GNUNET_NO, NULL); |
96 | if (GNUNET_SYSERR == nat_res) | 96 | if (GNUNET_SYSERR == nat_res) |
97 | { | 97 | { |
98 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 98 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 0ae875d0f..b1d25dd85 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -543,11 +543,11 @@ main (int argc, char *const *argv) | |||
543 | bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); | 543 | bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns"); |
544 | if ( (0 != geteuid ()) && | 544 | if ( (0 != geteuid ()) && |
545 | ( (GNUNET_YES != | 545 | ( (GNUNET_YES != |
546 | GNUNET_OS_check_helper_binary (bin_vpn, TRUE, NULL)) || | 546 | GNUNET_OS_check_helper_binary (bin_vpn, GNUNET_YES, NULL)) || |
547 | (GNUNET_YES != | 547 | (GNUNET_YES != |
548 | GNUNET_OS_check_helper_binary (bin_exit, TRUE, NULL)) || | 548 | GNUNET_OS_check_helper_binary (bin_exit, GNUNET_YES, NULL)) || |
549 | (GNUNET_YES != | 549 | (GNUNET_YES != |
550 | GNUNET_OS_check_helper_binary (bin_dns, TRUE, NULL))) ) | 550 | GNUNET_OS_check_helper_binary (bin_dns, GNUNET_YES, NULL))) ) |
551 | { | 551 | { |
552 | fprintf (stderr, | 552 | fprintf (stderr, |
553 | "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not SUID, refusing to run test (as it would have to fail).\n"); | 553 | "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not SUID, refusing to run test (as it would have to fail).\n"); |
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index b6e8980c9..52899d190 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -414,8 +414,8 @@ main (int argc, char *const *argv) | |||
414 | exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit.exe"); | 414 | exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit.exe"); |
415 | fprintf (stderr,"%s\n", vpn_binary); | 415 | fprintf (stderr,"%s\n", vpn_binary); |
416 | fprintf (stderr,"%s\n", exit_binary); | 416 | fprintf (stderr,"%s\n", exit_binary); |
417 | if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (vpn_binary, TRUE, NULL))) || // FIXME: CF: add test-parameters | 417 | if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (vpn_binary, GNUNET_YES, NULL))) || // FIXME: CF: add test-parameters |
418 | (GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (exit_binary, TRUE, NULL)))) // FIXME: CF: add test-parameters | 418 | (GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (exit_binary, GNUNET_YES, NULL)))) // FIXME: CF: add test-parameters |
419 | { | 419 | { |
420 | GNUNET_free (vpn_binary); | 420 | GNUNET_free (vpn_binary); |
421 | GNUNET_free (exit_binary); | 421 | GNUNET_free (exit_binary); |
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 29070560e..223791e18 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -1739,7 +1739,7 @@ libgnunet_plugin_transport_wlan_init (void *cls) | |||
1739 | } | 1739 | } |
1740 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-transport-wlan"); | 1740 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-transport-wlan"); |
1741 | if ( (0 == testmode) && | 1741 | if ( (0 == testmode) && |
1742 | (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, TRUE, NULL)) ) | 1742 | (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) ) |
1743 | { | 1743 | { |
1744 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1744 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1745 | _("Helper binary `%s' not SUID, cannot run WLAN transport\n"), | 1745 | _("Helper binary `%s' not SUID, cannot run WLAN transport\n"), |
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index e86de968a..e0e1614f4 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -634,7 +634,7 @@ start_process (int pipe_control, | |||
634 | int fd_stdin_read; | 634 | int fd_stdin_read; |
635 | int fd_stdin_write; | 635 | int fd_stdin_write; |
636 | 636 | ||
637 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, FALSE, NULL)) | 637 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL)) |
638 | return NULL; /* not executable */ | 638 | return NULL; /* not executable */ |
639 | if (GNUNET_YES == pipe_control) | 639 | if (GNUNET_YES == pipe_control) |
640 | { | 640 | { |
@@ -865,7 +865,7 @@ start_process (int pipe_control, | |||
865 | BOOL bresult; | 865 | BOOL bresult; |
866 | DWORD error_code; | 866 | DWORD error_code; |
867 | 867 | ||
868 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, FALSE, NULL)) | 868 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL)) |
869 | return NULL; /* not executable */ | 869 | return NULL; /* not executable */ |
870 | 870 | ||
871 | /* Search in prefix dir (hopefully - the directory from which | 871 | /* Search in prefix dir (hopefully - the directory from which |
@@ -1162,7 +1162,7 @@ start_process (int pipe_control, | |||
1162 | return NULL; | 1162 | return NULL; |
1163 | } | 1163 | } |
1164 | 1164 | ||
1165 | bresult = CreateProcessW (wpath, wcmd, NULL, NULL, TRUE, | 1165 | bresult = CreateProcessW (wpath, wcmd, NULL, NULL, GNUNET_YES, |
1166 | DETACHED_PROCESS | CREATE_SUSPENDED, env_block, NULL, &start, &proc); | 1166 | DETACHED_PROCESS | CREATE_SUSPENDED, env_block, NULL, &start, &proc); |
1167 | error_code = GetLastError (); | 1167 | error_code = GetLastError (); |
1168 | 1168 | ||
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index e3bc8a49c..a7a1ca213 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -3062,7 +3062,7 @@ run (void *cls, | |||
3062 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn"); | 3062 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn"); |
3063 | 3063 | ||
3064 | if (GNUNET_YES != | 3064 | if (GNUNET_YES != |
3065 | GNUNET_OS_check_helper_binary (binary, TRUE, NULL)) // FIXME: CF: add test-parameters | 3065 | GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) // FIXME: CF: add test-parameters |
3066 | { | 3066 | { |
3067 | fprintf (stderr, | 3067 | fprintf (stderr, |
3068 | "`%s' is not SUID, refusing to run.\n", | 3068 | "`%s' is not SUID, refusing to run.\n", |