From 91ab650ac42d34d4958e33da7ef0641842511a89 Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Feb 07 2017 10:36:38 +0000
Subject: py3: x509.py: return principal as unicode string


X509 return principal as unicode string

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

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

---

diff --git a/ipalib/x509.py b/ipalib/x509.py
index 87d46ae..60a947b 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -361,13 +361,13 @@ class _KRB5PrincipalName(univ.Sequence):
 
 def _decode_krb5principalname(data):
     principal = decoder.decode(data, asn1Spec=_KRB5PrincipalName())[0]
-    realm = (str(principal['realm']).replace('\\', '\\\\')
-                                    .replace('@', '\\@'))
+    realm = (unicode(principal['realm']).replace('\\', '\\\\')
+                                        .replace('@', '\\@'))
     name = principal['principalName']['name-string']
-    name = '/'.join(str(n).replace('\\', '\\\\')
-                          .replace('/', '\\/')
-                          .replace('@', '\\@') for n in name)
-    name = '%s@%s' % (name, realm)
+    name = u'/'.join(unicode(n).replace('\\', '\\\\')
+                               .replace('/', '\\/')
+                               .replace('@', '\\@') for n in name)
+    name = u'%s@%s' % (name, realm)
     return name