debian/changelog

+disorderfs (0.5.9-1) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Don't attempt to drop groups in multi-user mode when we are not root.
+    (Closes: reproducible-builds/disorderfs#1)
+
+  [ Vagrant Cascadian ]
+  * Update Vcs-Git in debian/control to include the "debian" packaging branch.
+
+ -- Chris Lamb <lamby@debian.org>  Thu, 16 Apr 2020 11:20:27 +0100
+
 disorderfs (0.5.8-2) unstable; urgency=medium
 
   * No change source upload to allow testing migration.

disorderfs.cpp

 /*
  * Copyright 2015, 2016 Andrew Ayer <agwa@andrewayer.name>
- * Copyright 2016, 2017 Chris Lamb <lamby@debian.org>
+ * Copyright 2016-2020 Chris Lamb <lamby@debian.org>
  *
  * This file is part of disorderfs.
  *
@@ -43,7 +43,7 @@ extern "C" {
 #include <sys/file.h>
 #include <stddef.h>
 
-#define DISORDERFS_VERSION "0.5.8"
+#define DISORDERFS_VERSION "0.5.9"
 
 namespace {
 	std::vector<std::string>	bare_arguments;
@@ -151,13 +151,13 @@ namespace {
 	struct Guard {
 		Guard ()
 		{
-			if (config.multi_user) {
+			if (config.multi_user && getuid() == 0) {
 				drop_privileges();
 			}
 		}
 		~Guard ()
 		{
-			if (config.multi_user) {
+			if (config.multi_user && getuid() == 0) {
 				restore_privileges();
 			}
 		}