Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ldap auth for function matches #34714

Merged
merged 1 commit into from
Jul 16, 2016
Merged

Fix ldap auth for function matches #34714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions salt/auth/ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ def expand_ldap_entries(entries, opts=None):
bind = _bind_for_search(opts=opts)
acl_tree = []
for user_or_group_dict in entries:
if not isinstance(user_or_group_dict, dict):
acl_tree.append(user_or_group_dict)
for minion_or_ou, matchers in six.iteritems(user_or_group_dict):
permissions = matchers
retrieved_minion_ids = []
Expand Down