summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/xmlrpc
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-04-01 10:34:29 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-04-01 10:34:29 +1100
commite51d05c9aa86db2911a68622fcf983e543576f07 (patch)
tree2ebc1d3da405a8e5b5381f1e0d655965d280c0f4 /lib/puppet/network/xmlrpc
parent4a39d64180377d12d994110cd38b350282863892 (diff)
downloadpuppet-e51d05c9aa86db2911a68622fcf983e543576f07.tar.gz
puppet-e51d05c9aa86db2911a68622fcf983e543576f07.tar.xz
puppet-e51d05c9aa86db2911a68622fcf983e543576f07.zip
Better fix for #1020
Diffstat (limited to 'lib/puppet/network/xmlrpc')
-rw-r--r--lib/puppet/network/xmlrpc/client.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index f6a5e8db6..357a766a1 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -49,6 +49,11 @@ module Puppet::Network
self.recycle_connection
retry
end
+ ["certificate verify failed", "hostname was not match", "hostname not match"].each do |str|
+ if detail.message.include?(str)
+ Puppet.warning "Certificate validation failed; considering using the certname configuration option"
+ end
+ end
raise XMLRPCClientError,
"Certificates were not trusted: %s" % detail
rescue ::XMLRPC::FaultException => detail