From f6a4c932b01a1b9b27159530909bdb3a3d073c54 Mon Sep 17 00:00:00 2001 From: Mathieu Le Marec - Pasquet Date: Mon, 4 May 2015 14:32:51 +0200 Subject: [PATCH] [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 --- addons/auth_ldap/users_ldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index 5f4f47b34a2..daf0cc0a242 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -140,8 +140,8 @@ class CompanyLDAP(osv.osv): results = [] try: conn = self.connect(conf) - conn.simple_bind_s(conf['ldap_binddn'] or '', - conf['ldap_password'].encode('utf-8') or '') + ldap_password = conf['ldap_password'] or '' + conn.simple_bind_s(conf['ldap_binddn'] or '', ldap_password.encode('utf-8')) results = conn.search_st(conf['ldap_base'], ldap.SCOPE_SUBTREE, filter, retrieve_attributes, timeout=60) conn.unbind()