Merge pull request #34714 from sjmh/fix/ldap_auth

Fix ldap auth for function matches
saltstack · Jul 16, 2016 · 922cc5a · 922cc5a
2 parents 40626d7 + d414403
commit 922cc5a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/salt/auth/ldap.py b/salt/auth/ldap.py
@@ -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 = []