IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: ldapupdate: fix logging str(bytes) issue

Browse Source 
bytes as argument of str() gives unexpected result by adding prefix "b"
there.

Also add missing safe_option() call to logging (it will fix another
str(bytes) issue)

https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti 2017-02-02 00:20:48 +01:00
parent 387a1513bb
commit b24787a67f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/ldapupdate.py
View File

@ -119,10 +119,10 @@ def safe_output(attr, values):
values = [values] values = [values]
try: try:
all(v.decode('ascii') for v in values) values = [v.decode('ascii') for v in values]
except UnicodeDecodeError: except UnicodeDecodeError:
try: try:
values = [base64.b64encode(v) for v in values] values = [base64.b64encode(v).decode('ascii') for v in values]
except TypeError: except TypeError:
pass pass
@ -656,7 +656,9 @@ class LDAPUpdate(object):
try: try:
entry_values.remove(update_value) entry_values.remove(update_value)
except ValueError: except ValueError:
self.debug("remove: '%s' not in %s", update_value, attr) self.debug(
"remove: '%s' not in %s",
safe_output(attr, update_value), attr)
else: else:
entry[attr] = entry_values entry[attr] = entry_values
self.debug('remove: updated value %s', safe_output( self.debug('remove: updated value %s', safe_output(