[GNUnet-SVN] [gnunet] branch master updated (ee19e4da1 -> c7ec44c12)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lurchi pushed a change to branch master
in repository gnunet.

    from ee19e4da1 fix warning
     new 9e54fe2c3 constructing path now works with SUID_BINARY_PATH = ""
     new c7ec44c12 clarify error messages

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/dns/gnunet-service-dns.c  | 3 ++-
 src/exit/gnunet-daemon-exit.c | 2 +-
 src/util/os_installation.c    | 2 +-
 src/vpn/gnunet-service-vpn.c  | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index dc9f37377..9c4f1f490 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1090,7 +1090,8 @@ run (void *cls,
                                      NULL)) // TODO: once we have a 
windows-testcase, add test parameters here
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-               _("`%s' must be installed SUID, will not run DNS 
interceptor\n"),
+               _("`%s' is not SUID or the path is invalid, "
+                 "will not run DNS interceptor\n"),
                binary);
     global_ret = 1;
     GNUNET_free (binary);
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index ed49a5297..716a1ead0 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3800,7 +3800,7 @@ run (void *cls,
     {
       GNUNET_free (binary);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("`%s' must be installed SUID, EXIT will not work\n"),
+                 _("`%s' is not SUID or the path is invalid, EXIT will not 
work\n"),
                  "gnunet-helper-exit");
       GNUNET_SCHEDULER_add_shutdown (&dummy_task,
                                     NULL);
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 46f878693..d2ce7fd9b 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -839,7 +839,7 @@ GNUNET_OS_get_suid_binary_path (const struct 
GNUNET_CONFIGURATION_Handle *cfg,
                                            "PATHS",
                                            "SUID_BINARY_PATH",
                                            &path);
-  if (NULL == path)
+  if (NULL == path || 0 == strlen (path))
     return GNUNET_OS_get_libexec_binary_path (progname);
   path_len = strlen (path);
   GNUNET_asprintf (&binary,
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index f48022b5f..260bafc60 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -2945,8 +2945,8 @@ run (void *cls,
                                      "-d gnunet-vpn - - 169.1.3.3.7 
255.255.255.0")) //ipv4 only please!
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "`%s' is not SUID, refusing to run.\n",
-                "gnunet-helper-vpn");
+                "`%s' is not SUID or the path is invalid, refusing to run.\n",
+                binary);
     GNUNET_free (binary);
     global_ret = 1;
     /* we won't "really" exit here, as the 'service' is still running;

-- 
To stop receiving notification emails like this one, please contact
address@hidden.