diff options
Diffstat (limited to 'src/exit')
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index 5bcf53f57..ed49a5297 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -3790,9 +3790,9 @@ run (void *cls, | |||
3790 | &max_connections)) | 3790 | &max_connections)) |
3791 | max_connections = 1024; | 3791 | max_connections = 1024; |
3792 | parse_ip_options (); | 3792 | parse_ip_options (); |
3793 | binary = GNUNET_OS_get_suid_binary_path (cfg, "gnunet-helper-exit"); | ||
3793 | if ( (ipv4_exit) || (ipv6_exit) ) | 3794 | if ( (ipv4_exit) || (ipv6_exit) ) |
3794 | { | 3795 | { |
3795 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit"); | ||
3796 | if (GNUNET_YES != | 3796 | if (GNUNET_YES != |
3797 | GNUNET_OS_check_helper_binary (binary, | 3797 | GNUNET_OS_check_helper_binary (binary, |
3798 | GNUNET_YES, | 3798 | GNUNET_YES, |
@@ -3807,10 +3807,10 @@ run (void *cls, | |||
3807 | global_ret = 1; | 3807 | global_ret = 1; |
3808 | return; | 3808 | return; |
3809 | } | 3809 | } |
3810 | GNUNET_free (binary); | ||
3811 | } | 3810 | } |
3812 | if (! (ipv4_enabled || ipv6_enabled)) | 3811 | if (! (ipv4_enabled || ipv6_enabled)) |
3813 | { | 3812 | { |
3813 | GNUNET_free (binary); | ||
3814 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3814 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
3815 | _("No useful service enabled. Exiting.\n")); | 3815 | _("No useful service enabled. Exiting.\n")); |
3816 | GNUNET_SCHEDULER_shutdown (); | 3816 | GNUNET_SCHEDULER_shutdown (); |
@@ -3824,6 +3824,7 @@ run (void *cls, | |||
3824 | cadet_handle = GNUNET_CADET_connect (cfg); | 3824 | cadet_handle = GNUNET_CADET_connect (cfg); |
3825 | if (NULL == cadet_handle) | 3825 | if (NULL == cadet_handle) |
3826 | { | 3826 | { |
3827 | GNUNET_free (binary); | ||
3827 | GNUNET_SCHEDULER_shutdown (); | 3828 | GNUNET_SCHEDULER_shutdown (); |
3828 | return; | 3829 | return; |
3829 | } | 3830 | } |
@@ -3831,6 +3832,7 @@ run (void *cls, | |||
3831 | if (GNUNET_OK != | 3832 | if (GNUNET_OK != |
3832 | setup_exit_helper_args ()) | 3833 | setup_exit_helper_args ()) |
3833 | { | 3834 | { |
3835 | GNUNET_free (binary); | ||
3834 | GNUNET_SCHEDULER_shutdown (); | 3836 | GNUNET_SCHEDULER_shutdown (); |
3835 | return; | 3837 | return; |
3836 | } | 3838 | } |
@@ -3927,11 +3929,12 @@ run (void *cls, | |||
3927 | } | 3929 | } |
3928 | } | 3930 | } |
3929 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, | 3931 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, |
3930 | "gnunet-helper-exit", | 3932 | binary, |
3931 | exit_argv, | 3933 | exit_argv, |
3932 | &message_token, | 3934 | &message_token, |
3933 | NULL, | 3935 | NULL, |
3934 | NULL); | 3936 | NULL); |
3937 | GNUNET_free (binary); | ||
3935 | } | 3938 | } |
3936 | 3939 | ||
3937 | 3940 | ||