do not use trusted forest name to construct domain admin principal

When `trust-add` is supplied AD domain admin name without realm component, the
code appends the uppercased AD forest root domain name to construct the full
principal. This can cause authentication error, however, when external trust
with non-root domain is requested.

We should instead use the supplied DNS domain name (if valid) as a realm
component.

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

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Martin Babinsky
2016-08-31 13:59:14 +02:00
committed by Martin Basti
parent 60e88038c4
commit f32e0e4e52

View File

@@ -319,7 +319,7 @@ def generate_creds(trustinstance, style, **options):
else:
sp = admin_name.split(sep)
if len(sp) == 1:
sp.append(trustinstance.remote_domain.info['dns_forest'].upper())
sp.append(trustinstance.remote_domain.info['dns_domain'].upper())
creds = u"{name}%{password}".format(name=sep.join(sp),
password=password)
return creds