10 files changed, 260 insertions, 125 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index c91669e..993ce0d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,7 @@ wydawca_SOURCES=\
  sql.h\
  tcpwrap.c\
  triplet.c\
+ userprivs.c\
  verify.c\
  wydawca.c\
  wydawca.h\
diff --git a/src/config.c b/src/config.c
index b1f339f..b6e2533 100644
--- a/src/config.c
+++ b/src/config.c
@@ -978,6 +978,7 @@ cb_access_method_params (enum gconf_callback_command cmd,
 
           meth->parmv[i] = xstrdup (vp->v.string);
         }
+      gl_list_iterator_free (&itr);
       meth->parmv[i] = NULL;
     }
   return 0;
@@ -1224,6 +1225,82 @@ cb_spool (enum gconf_callback_command cmd,
 }
 
 
+static int
+cb_user (enum gconf_callback_command cmd,
+         gconf_locus_t *locus,
+         void *varptr,
+         gconf_value_t *value,
+         void *cb_data)
+{
+  int rc;
+  struct passwd *pw;
+  
+  if (assert_string_arg (locus, cmd, value))
+    return 1;
+
+  pw = getpwnam (value->v.string);
+  if (!pw)
+    {
+      gconf_error (locus, 0, _("no such user: %s"), value->v.string);
+      return 1;
+    }
+  
+  wydawca_uid = pw->pw_uid;
+  wydawca_gid = pw->pw_gid;
+  return 0;
+}
+
+static int
+cb_supp_groups (enum gconf_callback_command cmd,
+                gconf_locus_t *locus,
+                void *varptr,
+                gconf_value_t *value,
+                void *cb_data)
+{
+  if (cmd != gconf_callback_set_value)
+    {
+      gconf_error (locus, 0, _("Unexpected block statement"));
+      return 1;
+    }
+  if (!value || value->type != GCONF_TYPE_LIST)
+    {
+      gconf_error (locus, 0, _("expected list value"));
+      return 1;
+    }
+
+  wydawca_supp_groupc = gl_list_size (value->v.list);
+  if (wydawca_supp_groupc == 0)
+    wydawca_supp_groups = NULL;
+  else
+    {
+      int i;
+      gl_list_iterator_t itr;
+      const void *p;
+      
+      wydawca_supp_groups = xcalloc (wydawca_supp_groupc,
+                                     sizeof (wydawca_supp_groups[0]));
+      itr = gl_list_iterator (value->v.list);
+      for (i = 0; gl_list_iterator_next (&itr, &p, NULL); i++)
+        {
+          const gconf_value_t *vp = p;
+          struct group *grp;
+          
+          if (assert_string_arg (locus, cmd, vp))
+            break;
+          grp = getgrnam (vp->v.string);
+          if (!grp)
+            {
+              gconf_error (locus, 0, _("no such group: %s"), value->v.string);
+              break;
+            }
+          wydawca_supp_groups[i] = grp->gr_gid;
+        }
+      gl_list_iterator_free (&itr);
+    }
+  return 0;
+}
+              
+
 
 static struct gconf_keyword wydawca_kw[] = {
   { "daemon", NULL, N_("Enable daemon mode"),
@@ -1237,6 +1314,11 @@ static struct gconf_keyword wydawca_kw[] = {
   { "pidfile", N_("file"), N_("Set pid file name"),
     gconf_type_string, &pidfile },
 
+  { "user", N_("name"), N_("Run with UID and GID of this user"),
+    gconf_type_string, NULL, 0, cb_user },
+  { "group", NULL, N_("Retain these supplementary groups"),
+    gconf_type_string|GCONF_LIST, NULL, 0, cb_supp_groups },
+  
   { "locking", NULL, N_("Enable or disable locking"),
     gconf_type_bool, &enable_locking },
   { "lockdir", N_("dir"), N_("Set directory for lock files"),
diff --git a/src/directive.c b/src/directive.c
index 2915fee..416095f 100644
--- a/src/directive.c
+++ b/src/directive.c
@@ -337,9 +337,7 @@ process_directives (struct file_triplet *trp, const struct spool *spool)
           break;
 
         case filename_dir:
-          wydawca_set_root_privs ();
           rc = verify_detached_signature (trp, spool);
-          wydawca_set_triplet_privs (trp);
           if (rc == 0)
             {
               if (move_file (trp, spool, file_dist, relative_dir)
diff --git a/src/diskio.c b/src/diskio.c
index fbd1050..35ba71e 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -58,9 +58,9 @@ concat_dir (const char *base, const char *name, size_t *pbaselen)
 }
 
 /* Create the directory DIR, eventually creating all intermediate directories
-   starting from DIR + BASELEN, with owner UID and GID. */
+   starting from DIR + BASELEN. */
 int
-create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid)
+create_hierarchy (char *dir, size_t baselen)
 {
   int rc;
   struct stat st;
@@ -92,7 +92,7 @@ create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid)
       *p = 0;
     }
 
-  rc = create_hierarchy (dir, baselen, uid, gid);
+  rc = create_hierarchy (dir, baselen);
   if (rc == 0)
     {
       if (p)
@@ -103,11 +103,6 @@ create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid)
                   dir, strerror (errno));
           rc = 1;
         }
-      if (chown (dir, uid, gid))
-        {
-          logmsg (LOG_NOTICE, _("cannot change ownership of %s: %s"),
-                  dir, strerror (errno));
-        }
     }
   return rc;
 }
@@ -116,18 +111,14 @@ create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid)
    NAME). Use UID and GID as owner ids.
    Do nothing if dry_run_mode is set. */
 char *
-create_directory (const char *base, const char *name, uid_t uid, gid_t gid)
+create_directory (const char *base, const char *name)
 {
   size_t baselen;
   char *dir = concat_dir (base, name, &baselen);
 
   if (!dry_run_mode)
     {
-      int rc;
-      wydawca_set_root_privs ();
-      rc = create_hierarchy (dir, baselen, uid, gid);
-      wydawca_set_privs (uid, gid);
-      if (rc)
+      if (create_hierarchy (dir, baselen))
         {
           free (dir);
           dir = NULL;
@@ -137,9 +128,9 @@ create_directory (const char *base, const char *name, uid_t uid, gid_t gid)
 }
 
 
-/* Copy FILE to DST_FILE, creating the latter with owner UID and GID. */
+/* Copy FILE to DST_FILE. */
 int
-copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid)
+copy_file (const char *file, const char *dst_file)
 {
   int in_fd, out_fd;
   struct stat st;
@@ -223,10 +214,9 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid)
 }
 
 /* Move FILE to DST_FILE. If they reside on different devices, use copy_file
-   + unlink.
-   UID and GID give DST_FILE ownership. */
+   + unlink. */
 int
-do_move_file (const char *file, const char *dst_file, uid_t uid, gid_t gid)
+do_move_file (const char *file, const char *dst_file)
 {
   int rc = 0;
 
@@ -234,7 +224,7 @@ do_move_file (const char *file, const char *dst_file, uid_t uid, gid_t gid)