From 1a5cf5b28ca3143c72abaa85db59cf827d25a379 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Wed, 12 Mar 2014 17:51:43 +0200
Subject: [PATCH 59/60] ipaserver/dcerpc: make sure to always return unicode
 SID of the trust domain

Trusted domain SID could be obtained through different means. When it is
fetched from the AD DC via LDAP, it needs to be extracted from a default
context and explicitly converted to unicode.

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

Reviewed-By: Martin Kosek <mkosek@redhat.com>
---
 ipaserver/dcerpc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 5972e622292a033d4fc979cbf5401fa02151f35c..f1c75089b875787debcee22316a4898b424d923f 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -750,7 +750,7 @@ def retrieve_anonymously(self, remote_host, discover_srv=False):
 
     def parse_naming_context(self, context):
         naming_ref = re.compile('.*<SID=(S-.*)>.*')
-        return naming_ref.match(context).group(1)
+        return unicode(naming_ref.match(context).group(1))
 
     def retrieve(self, remote_host):
         self.init_lsa_pipe(remote_host)
-- 
1.8.5.3