mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #34714 from sjmh/fix/ldap_auth
Fix ldap auth for function matches
This commit is contained in:
commit
922cc5a8a7
1 changed files with 2 additions and 0 deletions
|
@ -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 = []
|
||||
|
|
Loading…
Add table
Reference in a new issue