diff options
author | Alexander Bokovoy <abokovoy@redhat.com> | 2015-05-28 11:49:58 +0000 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2015-07-08 01:56:52 +0200 |
commit | 47e1de760413e5354f704fc808d960490d80338c (patch) | |
tree | 393570e45109bd5b40d8a3746402398b8a3d1570 /ipaserver | |
parent | 03c2d76186534081400846f4141fbbef8e41ae83 (diff) | |
download | freeipa-47e1de760413e5354f704fc808d960490d80338c.tar.gz freeipa-47e1de760413e5354f704fc808d960490d80338c.tar.xz freeipa-47e1de760413e5354f704fc808d960490d80338c.zip |
trusts: pass AD DC hostname if specified explicitly
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1222047
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/dcerpc.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 530f41540..a54f5f67f 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -1048,7 +1048,7 @@ class TrustDomainInstance(object): return False -def fetch_domains(api, mydomain, trustdomain, creds=None): +def fetch_domains(api, mydomain, trustdomain, creds=None, server=None): trust_flags = dict( NETR_TRUST_FLAG_IN_FOREST = 0x00000001, NETR_TRUST_FLAG_OUTBOUND = 0x00000002, @@ -1089,8 +1089,12 @@ def fetch_domains(api, mydomain, trustdomain, creds=None): cr.set_workstation(domain_validator.flatname) netrc = net.Net(creds=cr, lp=td.parm) try: - result = netrc.finddc(domain=trustdomain, - flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS) + if server: + result = netrc.finddc(address=server, + flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS) + else: + result = netrc.finddc(domain=trustdomain, + flags=nbt.NBT_SERVER_LDAP | nbt.NBT_SERVER_DS) except RuntimeError, e: raise assess_dcerpc_exception(message=str(e)) |