valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Catch traceback when LDAP returns something other than the nested tuple

Browse Source
This commit is contained in:
C. R. Oldham 2016-03-22 10:59:37 -06:00
parent 4af4280d04
commit c57a232809
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/auth/ldap.py
View File

@ -407,8 +407,14 @@ def expand_ldap_entries(entries, opts=None):
search_string,
['cn'])
for ldap_match in search_results:
minion_id = ldap_match[1]['cn'][0].lower()
retrieved_minion_ids.append(minion_id)
try:
minion_id = ldap_match[1]['cn'][0].lower()
retrieved_minion_ids.append(minion_id)
except TypeError:
# TypeError here just means that one of the returned
# entries didn't match the format we expected
# from LDAP.
pass
for minion_id in retrieved_minion_ids:
acl_tree.append({minion_id: permissions})