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

Extend perms list instead of appending; fixes non-group auth regression

Browse Source
This commit is contained in:
Seth House 2015-04-25 17:39:15 -06:00
parent ca4f45c005
commit 3404dff72b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/master.py
View File

@ -2223,9 +2223,9 @@ class ClearFuncs(object):
auth_list = []
if '*' in self.opts['external_auth'][token['eauth']]:
auth_list.append(self.opts['external_auth'][token['eauth']]['*'])
auth_list.extend(self.opts['external_auth'][token['eauth']]['*'])
if token['name'] in self.opts['external_auth'][token['eauth']]:
auth_list.append(self.opts['external_auth'][token['eauth']][token['name']])
auth_list.extend(self.opts['external_auth'][token['eauth']][token['name']])
if group_auth_match:
auth_list = self.ckminions.fill_auth_list_from_groups(self.opts['external_auth'][token['eauth']], token['groups'], auth_list)