From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 20 Sep 2018 12:46:42 +0000 (+0200)
Subject: main: set default user/group only when specified for non-root users, fixes #5213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4b569a92513b0e11b709fb88121761c74262e52;p=thirdparty%2Ftvheadend.git

main: set default user/group only when specified for non-root users, fixes #5213
---

diff --git a/src/main.c b/src/main.c
index 47a00fa0d..24e53aceb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1046,10 +1046,10 @@ main(int argc, char **argv)
   signal(SIGILL, handle_sigill);   // see handler..
 
   /* Set priviledges */
-  if(opt_fork || opt_group || opt_user) {
+  if((opt_fork && getuid() == 0) || opt_group || opt_user) {
     const char *homedir;
     struct group  *grp = getgrnam(opt_group ?: "video");
-    struct passwd *pw  = opt_user ? getpwnam(opt_user) : NULL;
+    struct passwd *pw  = getpwnam(opt_user ?: "daemon");
 
     if(grp != NULL) {
       gid = grp->gr_gid;