X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/52b866481399dfcecd295560800d3e3fe0090f24..0d9974ba1c7a707352f9d50f592b39b095de534d:/common/util.c

diff --git a/common/util.c b/common/util.c
index 92b9853d..3de554d7 100644
--- a/common/util.c
+++ b/common/util.c
@@ -70,6 +70,7 @@ void u_quotify(dstr *d, const char *p)
     }
     dstr_putc(d, '\"');
   }
+  dstr_putz(d);
 }
 
 /* --- @u_getuser@ --- *
@@ -137,7 +138,9 @@ gid_t u_getgroup(const char *name)
 
 void u_setugid(uid_t u, gid_t g)
 {
-  if (g != (gid_t)-1) {
+  uid_t cu = geteuid();
+
+  if (cu == 0 && g != (gid_t)-1) {
     if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) {
       die(EXIT_FAILURE, "couldn't setgid to %u: %s",
 	  (unsigned)g, strerror(errno));