valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix freebsd failing test

Browse Source
This commit is contained in:
C. R. Oldham 2013-11-14 12:31:56 -07:00
parent 6d78c0ebf9
commit dde73af9ec
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/modules/cmdmod.py
View File

@ -51,12 +51,29 @@ def __virtual__():
def _chugid(runas): def _chugid(runas):
uinfo = pwd.getpwnam(runas) uinfo = pwd.getpwnam(runas)
supgroups_seen = set() supgroups_seen = set()
supgroups = [
g.gr_gid for g in grp.getgrall()
if uinfo.pw_name in g.gr_mem and g.gr_gid != uinfo.pw_gid
and g.gr_gid not in supgroups_seen and not supgroups_seen.add(g.gr_gid)
]
# The line below used to exclude the current user's primary gid.
# However, when root belongs to more than one group
# this causes root's primary group of '0' to be dropped from
# his grouplist. On FreeBSD, at least, this makes some
# command executions fail with 'access denied'.
#
# The Python documentation says that os.setgroups sets only
# the supplemental groups for a running process. On FreeBSD
# this does not appear to be strictly true.
# supgroups = [
# g.gr_gid for g in grp.getgrall()
# if uinfo.pw_name in g.gr_mem and g.gr_gid != uinfo.pw_gid
# and g.gr_gid not in supgroups_seen and not supgroups_seen.add(g.gr_gid)
# ]
supgroups =
[ g.gr_gid for g in grp.getgrall()
if uinfo.pw_name in g.gr_mem \
and g.gr_gid not in supgroups_seen \
and not supgroups_seen.add(g.gr_gid)
]
# No logging can happen on this function # No logging can happen on this function
# #
# 08:46:32,161 [salt.loaded.int.module.cmdmod:276 ][DEBUG ] stderr: Traceback (most recent call last): # 08:46:32,161 [salt.loaded.int.module.cmdmod:276 ][DEBUG ] stderr: Traceback (most recent call last):