summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-03-29 13:27:11 -0400
committerRob Crittenden <rcritten@redhat.com>2011-03-30 10:03:56 -0400
commitb3a85890ef7c80531cbd2cde0f89d79aed8d496c (patch)
treeb6d546aac6f02adbeaf2a8117b6c330b612c79f7 /ipa-client
parent87193366526e645475792cde2450cc7cc48802ad (diff)
downloadfreeipa-b3a85890ef7c80531cbd2cde0f89d79aed8d496c.tar.gz
freeipa-b3a85890ef7c80531cbd2cde0f89d79aed8d496c.tar.xz
freeipa-b3a85890ef7c80531cbd2cde0f89d79aed8d496c.zip
Make retrieval of the CA during DNS discovery non-fatal.
ticket 1135
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/ipaclient/ipadiscovery.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index e7c5830da..0df23eb97 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -185,7 +185,8 @@ class IPADiscovery:
try:
run(["/usr/bin/wget", "-O", "%s/ca.crt" % temp_ca_dir, "http://%s/ipa/config/ca.crt" % thost])
except CalledProcessError, e:
- raise RuntimeError('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
+ logging.debug('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
+ return []
#now verify the server is really an IPA server
try: