From 436d2de456c14c869c9970fb53c2931c7c8e67c8 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Fri, 8 Sep 2017 12:49:04 +0200 Subject: [PATCH] ldap2: don't use decode() on str instance This was causing issues when adding/removing a CA in the CA plugin. https://pagure.io/freeipa/issue/7131 Reviewed-By: Florence Blanc-Renaud Reviewed-By: Alexander Bokovoy --- ipaserver/plugins/ldap2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index 358b3f0ef..07d6f354e 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -353,7 +353,7 @@ class ldap2(CrudBackend, LDAPClient): attrs = self.get_effective_rights(dn, ["*"]) if 'entrylevelrights' in attrs: - entry_rights = attrs['entrylevelrights'][0].decode('UTF-8') + entry_rights = attrs['entrylevelrights'][0] if 'd' in entry_rights: return True @@ -366,7 +366,7 @@ class ldap2(CrudBackend, LDAPClient): assert isinstance(dn, DN) attrs = self.get_effective_rights(dn, ["*"]) if 'entrylevelrights' in attrs: - entry_rights = attrs['entrylevelrights'][0].decode('UTF-8') + entry_rights = attrs['entrylevelrights'][0] if 'a' in entry_rights: return True