[patch] call setgroups with all groups that the portage user belongs to

setgroups.patch (text/plain), 1.81 KB, created by Zac Medico on 2006-10-19 16:07:05 UTC

Index: pym/portage_data.py
===================================================================
--- pym/portage_data.py	(revision 4759)
+++ pym/portage_data.py	(revision 4760)
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+if not hasattr(__builtins__, "set"):
+	from sets import Set as set
 
 import os,pwd,grp
 from portage_util import writemsg
@@ -107,3 +109,10 @@
 	writemsg(red("*** Please add this user to the portage group if you wish to use portage.\n"))
 	writemsg("\n")
 	portage_group_warning()
+
+userpriv_groups = [portage_gid]
+if secpass >= 2:
+	for g in grp.getgrall():
+		if "portage" in g[3]:
+			userpriv_groups.append(g[2])
+	userpriv_groups = list(set(userpriv_groups))
Index: pym/portage.py
===================================================================
--- pym/portage.py	(revision 4759)
+++ pym/portage.py	(revision 4760)
@@ -73,7 +73,7 @@
 	  INCREMENTALS, EAPI, MISC_SH_BINARY
 
 	from portage_data import ostype, lchown, userland, secpass, uid, wheelgid, \
-	                         portage_uid, portage_gid
+	                         portage_uid, portage_gid, userpriv_groups
 	from portage_manifest import Manifest
 
 	import portage_util
@@ -1926,7 +1926,7 @@
 		 ("userpriv" in string.split(mysettings["RESTRICT"]))))
 
 	if droppriv and not uid and portage_gid and portage_uid:
-		keywords.update({"uid":portage_uid,"gid":portage_gid,"groups":[portage_gid],"umask":002})
+		keywords.update({"uid":portage_uid,"gid":portage_gid,"groups":userpriv_groups,"umask":002})
 
 	if not free:
 		free=((droppriv and "usersandbox" not in features) or \
@@ -2257,7 +2257,7 @@
 						spawn_keywords.update({
 							"uid"    : portage_uid,
 							"gid"    : portage_gid,
-							"groups" : [portage_gid],
+							"groups" : userpriv_groups,
 							"umask"  : 002})
 
 					try: