[main] Allow specifying the group to use in the configuration file

owntone · Oct 22, 2023 · e976234 · e976234
1 parent 912e00d
commit e976234
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/docs/building.md b/docs/building.md
@@ -181,7 +181,7 @@ Note: if for some reason you've installed the avahi port, you need to
 add `--without-avahi` to configure above.
 
 Edit `/usr/local/etc/owntone.conf` and change the `uid` to a nice
-system daemon (eg: unknown), and run the following:
+system daemon (eg: unknown) and optionnally the `gid`, and run the following:
 
 ```bash
 sudo mkdir -p /usr/local/var/run

diff --git a/owntone.conf.in b/owntone.conf.in
@@ -12,6 +12,11 @@ general {
 	# Make sure the user has read access to the library directories you set
 	# below, and full access to the databases, log and local audio
 	uid = "@OWNTONE_USER@"
+
+	# User group
+	# The library might be shared by multiple users that all belong to this group. 
+	# Default to the first group declared for the user
+#	gid = "@OWNTONE_USER@"
 
 	# Database location
 #	db_path = "@localstatedir@/cache/@PACKAGE@/songs3.db"

diff --git a/src/conffile.c b/src/conffile.c
@@ -45,6 +45,7 @@ static int cb_loglevel(cfg_t *cfg, cfg_opt_t *opt, const char *value, void *resu
 static cfg_opt_t sec_general[] =
   {
     CFG_STR("uid", "nobody", CFGF_NONE),
+    CFG_STR("gid", "", CFGF_NONE),
     CFG_STR("db_path", STATEDIR "/cache/" PACKAGE "/songs3.db", CFGF_NONE),
     CFG_STR("db_backup_path", NULL, CFGF_NONE),
     CFG_STR("logfile", STATEDIR "/log/" PACKAGE ".log", CFGF_NONE),

diff --git a/src/main.c b/src/main.c
@@ -117,6 +117,7 @@ daemonize(bool background, char *pidfile)
   int fd;
   int ret;
   char *runas;
+  char *runasgroup;
 
   if (background)
     {
@@ -189,12 +190,27 @@ daemonize(bool background, char *pidfile)
     {
       runas = cfg_getstr(cfg_getsec(cfg, "general"), "uid");
 
-      ret = initgroups(runas, runas_gid);
-      if (ret != 0)
+      runasgroup = cfg_getstr(cfg_getsec(cfg, "general"), "gid");
+      if (strlen(runasgroup))
+	{
+	  struct group * grp = getgrnam(runasgroup);
+	  if (grp != NULL)
+	    runas_gid = grp->gr_gid;
+	  else
+	    {
+	      DPRINTF(E_FATAL, L_MAIN, "getgrnam() failed: %s\n", strerror(errno));
+
+	      return -1;
+	    } 
+	} else
 	{
-	  DPRINTF(E_FATAL, L_MAIN, "initgroups() failed: %s\n", strerror(errno));
+	  ret = initgroups(runas, runas_gid);
+	  if (ret != 0)
+	    {
+	      DPRINTF(E_FATAL, L_MAIN, "initgroups() failed: %s\n", strerror(errno));
 
-	  return -1;
+	      return -1;
+	    }
 	}
 
       ret = setegid(runas_gid);