diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-10-03 09:43:08 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-10-03 14:14:07 +0200 |
| commit | 88759cf7b6b3d6da1f10e4e8fbf26685e5235a7b (patch) | |
| tree | 7dd5f3f825bfa65056012a07fabc62bd87852164 | |
| parent | bae291def780c81144c8f4d71ced5007e1ee3867 (diff) | |
Use FQDN when creating MSDCS SRV records
When IPA server hostname is outside of default DNS domain, instead
of relative domain name, FQDN should be used.
https://fedorahosted.org/freeipa/ticket/3908
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 5839b2f17..b3046386b 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -31,6 +31,7 @@ from ipaserver.install.dsinstance import realm_to_serverid from ipaserver.install.bindinstance import get_rr, add_rr, del_rr, \ dns_zone_exists from ipalib import errors, api +from ipalib.util import normalize_zone from ipapython.dn import DN from ipapython import sysrestore from ipapython import ipautil @@ -506,13 +507,19 @@ class ADTRUSTInstance(service.Service): """ zone = self.domain_name - host = self.fqdn.split(".")[0] + host, host_domain = self.fqdn.split(".", 1) + + if normalize_zone(zone) == normalize_zone(host_domain): + host_in_rr = host + else: + host_in_rr = normalize_zone(self.fqdn) + priority = 0 ipa_srv_rec = ( - ("_ldap._tcp", [self.srv_rec(host, 389, priority)], 389), - ("_kerberos._tcp", [self.srv_rec(host, 88, priority)], 88), - ("_kerberos._udp", [self.srv_rec(host, 88, priority)], 88), + ("_ldap._tcp", [self.srv_rec(host_in_rr, 389, priority)], 389), + ("_kerberos._tcp", [self.srv_rec(host_in_rr, 88, priority)], 88), + ("_kerberos._udp", [self.srv_rec(host_in_rr, 88, priority)], 88), ) win_srv_suffix = (".Default-First-Site-Name._sites.dc._msdcs", ".dc._msdcs") |