From: lurchi <lurchi@strangeplace.net>
Date: Wed, 3 Jul 2019 20:31:02 +0000 (+0200)
Subject: clarify error messages
X-Git-Tag: v0.11.6~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7ec44c1263a19ee056eaec27c8bfb2ecd4e5184;p=oweals%2Fgnunet.git

clarify error messages
---

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/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;