Merge pull request #34957 from sjmh/2016.3

Don't fall through to checking auth entries
saltstack · Jul 26, 2016 · f765faa · f765faa
2 parents 2d3b95d + 0095dbe
commit f765faa
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/salt/auth/ldap.py b/salt/auth/ldap.py
@@ -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 = []