odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] auth_ldap: anonymous connection 

LDAP allows anonymous authentication with no password. In such case
conf['ldap_password'] is None so converting would fail.
Fixes #5763
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-05-04 14:32:51 +02:00 committed by Martin Trigaux
parent 1593c5c482
commit f6a4c932b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/auth_ldap/users_ldap.py
View File

@ -140,8 +140,8 @@ class CompanyLDAP(osv.osv):
results = [] results = []
try: try:
conn = self.connect(conf) conn = self.connect(conf)
conn.simple_bind_s(conf['ldap_binddn'] or '', ldap_password = conf['ldap_password'] or ''
conf['ldap_password'].encode('utf-8') or '') conn.simple_bind_s(conf['ldap_binddn'] or '', ldap_password.encode('utf-8'))
results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE, results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE,
filter, retrieve_attributes, timeout=60) filter, retrieve_attributes, timeout=60)
conn.unbind() conn.unbind()