openstack
/
ldappool
Code Issues Proposed changes

#4: UTF-8 encode passwd only when set

This commit is contained in:
Charles Duffy 2013-04-18 16:59:32 -05:00
parent 6c43653950
commit 0e1da6275b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ldappool/__init__.py
View File

@ -139,7 +139,8 @@ class ConnectionManager(object):
return len(self._pool)
def _match(self, bind, passwd):
passwd = passwd.encode('utf8')
if passwd is not None:
passwd = passwd.encode('utf8')
with self._pool_lock:
inactives = []
@ -200,7 +201,8 @@ class ConnectionManager(object):
"""
tries = 0
connected = False
passwd = passwd.encode('utf8')
if passwd is not None:
passwd = passwd.encode('utf8')
exc = None
# trying retry_max times in a row with a fresh connector