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

USERS_LDAP: don't use sync fnct 

bzr revid: ced-1ad45aaf703eb418010d973c70e15a67ac18ffe1
This commit is contained in:
ced 2007-03-19 16:10:52 +00:00
parent e81f84d73e
commit d853087121
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/users_ldap/users_ldap.py
View File

@ -62,12 +62,12 @@ def ldap_login(oldfnc):
for res_company in cr.dictfetchall():
try:
l = ldap.open(res_company['ldap_server'])
if l.simple_bind_s(res_company['ldap_binddn'], res_company['ldap_password']):
if l.simple_bind(res_company['ldap_binddn'], res_company['ldap_password']):
base = res_company['ldap_base']
scope = ldap.SCOPE_SUBTREE
filter = res_company['ldap_filter']%(login,)
retrieve_attributes = None
result_id = l.search_s(base, scope, filter, retrieve_attributes)
result_id = l.search(base, scope, filter, retrieve_attributes)
timeout = 60
result_type, result_data = l.result(result_id, timeout)
if not result_data:
@ -75,7 +75,7 @@ def ldap_login(oldfnc):
if result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
dn=result_data[0][0]
name=result_data[0][1]['cn']
if l.bind_s(dn, passwd):
if l.bind(dn, passwd):
cr.execute("select id from res_users where login=%s",(login.encode('utf-8'),))
res = cr.fetchone()
if res:
@ -112,18 +112,18 @@ def ldap_check(oldfnc):
company = user.company_id
try:
l = ldap.open(company.ldap_server)
if l.simple_bind_s(company.ldap_binddn, company.ldap_password):
if l.simple_bind(company.ldap_binddn, company.ldap_password):
base = company['ldap_base']
scope = ldap.SCOPE_SUBTREE
filter = company['ldap_filter']%(user.login,)
retrieve_attributes = None
result_id = l.search_s(base, scope, filter, retrieve_attributes)
result_id = l.search(base, scope, filter, retrieve_attributes)
timeout = 60
result_type, result_data = l.result(result_id, timeout)
if result_data and result_type == ldap.RES_SEARCH_RESULT and len(result_data) == 1:
dn=result_data[0][0]
name=result_data[0][1]['cn']
if l.bind_s(dn, passwd):
if l.bind(dn, passwd):
security._uid_cache[uid] = passwd
cr.close()
return True