saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #34957 from sjmh/2016.3

Browse source 
Don't fall through to checking auth entries
This commit is contained in:
Mike Place 2016-07-26 16:16:17 -06:00 • committed by GitHub
commit f765faa3aa
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/auth/ldap.py
View file

@ -393,6 +393,7 @@ def expand_ldap_entries(entries, opts=None):
for user_or_group_dict in entries:
if not isinstance(user_or_group_dict, dict):
acl_tree.append(user_or_group_dict)
continue
for minion_or_ou, matchers in six.iteritems(user_or_group_dict):
permissions = matchers
retrieved_minion_ids = []