summaryrefslogtreecommitdiffstats
path: root/ipaserver/dcerpc.py
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2014-03-12 17:51:43 +0200
committerMartin Kosek <mkosek@redhat.com>2014-03-12 18:16:52 +0100
commit6195870e828cfa726b1cf7d868e5849ac2943bc7 (patch)
tree63ac00d87edad6a2f05331f06a72ccb9d30b02c6 /ipaserver/dcerpc.py
parent723166aebeacc17f87b3b274c0f9ae0b58bf8a74 (diff)
downloadfreeipa-6195870e828cfa726b1cf7d868e5849ac2943bc7.tar.gz
freeipa-6195870e828cfa726b1cf7d868e5849ac2943bc7.tar.xz
freeipa-6195870e828cfa726b1cf7d868e5849ac2943bc7.zip
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>
Diffstat (limited to 'ipaserver/dcerpc.py')
-rw-r--r--ipaserver/dcerpc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 9e03b34cf..3b89adc08 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -750,7 +750,7 @@ class TrustDomainInstance(object):
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)