Merge pull request #34223 from peterdemin/bugfix-eauth-ldap-expanding

Fixed typo in filtering LDAP's potential_ous
saltstack · Jun 23, 2016 · 0a02671 · 0a02671
2 parents f74f176 + 8bb03ec
commit 0a02671
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/utils/minions.py b/salt/utils/minions.py
@@ -963,7 +963,7 @@ def fill_auth_list_from_ou(self, auth_list, opts=None):
         for item in auth_list:
             if isinstance(item, six.string_types):
                 continue
-            ou_names.append([potential_ou for potential_ou in item.keys() if potential_ou.startswith('ldap(')])
+            ou_names.extend([potential_ou for potential_ou in item.keys() if potential_ou.startswith('ldap(')])
         if ou_names:
             auth_list = salt.auth.ldap.expand_ldap_entries(auth_list, opts)
         return auth_list