Merge ad3862d into 56d0cd1

python-diamond · May 16, 2017 · e28129e · e28129e
2 parents 56d0cd1 + ad3862d
commit e28129e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/bin/diamond b/bin/diamond
@@ -201,7 +201,14 @@ def main():
             try:
                 if gid != -1 and uid != -1:
                     # Manually set the groups since they aren't set by default
-                    os.initgroups(pwd.getpwuid(uid).pw_name, gid)
+
+                    # Python 2.7+
+                    if hasattr(os, 'initgroups'):
+                        os.initgroups(user, gid)
+                    # Python 2.6
+                    else:
+                        os.setgroups([e.gr_gid for e in grp.getgrall()
+                                      if user in e.gr_mem] + [gid])
 
                 if gid != -1 and os.getgid() != gid:
                     # Set GID