I changed the "wrong UID/GID" error messages that go to syslog to make

them more explicit.  Both myself and my test user got confused the
first time, and tried to reconfigure with the GID it was already
configured with.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/common.c b/src/common.c
index f21b49759..9e5b5137a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -56,18 +56,20 @@ fatal(const char* ident, const char* format, ...)
 /* Is the parent process allowed to call us?
  */
 void
-check_caller(const char* ident, uid_t parentuid, gid_t parentgid)
+check_caller(const char* ident, uidt parentuid, gid_t parentgid)
 {
 	/* compare to our parent's uid */
 	if (parentuid != getuid()) {
 	    fatal(ident,
-		  "Attempt to exec script with invalid uid %d, expected %d",
-		  getuid(), parentuid);
+		  "Failure to exec script. WANTED uid %d, GOT uid %d.  "
+                  "(Reconfigure to take %d?)",
+		  parentuid, getuid(), getuid());
 	}
 	if (parentgid != getgid()) {
 	    fatal(ident,
-		  "Attempt to exec script with invalid gid %d, expected %d",
-		  getgid(), parentgid);
+		  "Failure to exec script. WANTED gid %d, GOT gid %d.  "
+                  "(Reconfigure to take %d?)",
+		  parentgid, getgid(), getgid());
 	}
 }