summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2017-01-31 18:11:42 +0100
committerJan Cholasta <jcholast@redhat.com>2017-02-10 14:03:04 +0100
commit8660b9e96801a764e808ca69c3c14a4a019d4eb8 (patch)
tree4dfe78f18a63fda472e91b18993b2c480242bf36 /ipaserver
parentc27a46177c710fb18bf5b02beab4bd82c191a4bc (diff)
downloadfreeipa-8660b9e96801a764e808ca69c3c14a4a019d4eb8.tar.gz
freeipa-8660b9e96801a764e808ca69c3c14a4a019d4eb8.tar.xz
freeipa-8660b9e96801a764e808ca69c3c14a4a019d4eb8.zip
py3: kem.py: user bytes with ldap values
python ldap requires bytes as values https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/secrets/kem.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/ipaserver/secrets/kem.py b/ipaserver/secrets/kem.py
index 3577975b9..5d784b705 100644
--- a/ipaserver/secrets/kem.py
+++ b/ipaserver/secrets/kem.py
@@ -130,13 +130,13 @@ class KEMLdap(iSecLdap):
service_rdn = ('cn', servicename) if servicename != 'host' else DN()
dn = str(DN(('cn', name), service_rdn, self.keysbase))
try:
- mods = [('objectClass', ['nsContainer',
- 'ipaKeyPolicy',
- 'ipaPublicKeyObject',
- 'groupOfPrincipals']),
- ('cn', name),
- ('ipaKeyUsage', RFC5280_USAGE_MAP[usage]),
- ('memberPrincipal', principal),
+ mods = [('objectClass', [b'nsContainer',
+ b'ipaKeyPolicy',
+ b'ipaPublicKeyObject',
+ b'groupOfPrincipals']),
+ ('cn', name.encode('utf-8')),
+ ('ipaKeyUsage', RFC5280_USAGE_MAP[usage].encode('utf-8')),
+ ('memberPrincipal', principal.encode('utf-8')),
('ipaPublicKey', public_key)]
conn.add_s(dn, mods)
except Exception: # pylint: disable=broad-except