diff options
author | Martin Kosek <mkosek@redhat.com> | 2013-01-02 10:43:49 +0100 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-01-02 13:28:13 +0100 |
commit | b6c81f21f566303bbc37033c2a7f06e11a5bcf42 (patch) | |
tree | a96f5bd3f83317593b5cea2f0cdbc5cbd3a68ef9 | |
parent | 8a981c06c36efedc726080583ffdeea82ef36703 (diff) | |
download | freeipa-b6c81f21f566303bbc37033c2a7f06e11a5bcf42.tar.gz freeipa-b6c81f21f566303bbc37033c2a7f06e11a5bcf42.tar.xz freeipa-b6c81f21f566303bbc37033c2a7f06e11a5bcf42.zip |
Do not crash when Kerberos SRV record is not found
ipa-client-install crashed when IPA server realm TXT record was
configured, but the referred domain (lower-case realm value) did
not contain any Kerberos SRV record (_kerberos._udp.<realm>.)
https://fedorahosted.org/freeipa/ticket/3316
-rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index 63acf6200..2214a81ba 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -436,9 +436,10 @@ class IPADiscovery(object): kdc = self.ipadns_search_srv(domain, '_kerberos._udp', 88, break_on_first=False) - if not kdc: + if kdc: + kdc = ','.join(kdc) + else: root_logger.debug("SRV record for KDC not found! Realm: %s, SRV record: %s" % (realm, qname)) kdc = None - kdc = ','.join(kdc) return realm, kdc |