summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-03-31 21:03:56 -0500
committerLuke Kanies <luke@madstop.com>2008-03-31 21:03:56 -0500
commit1ad0ceca6cd06f03279125f1f39f11a0beec310b (patch)
treecf00bb1e82ec0d0661421574ef27a268043b8c72 /lib/puppet/network
parent6f32e95ce25fb6de40836cb7c7678f39c5e77879 (diff)
parentf927b97f9ba454dab23255a259642b6b5dc1aae9 (diff)
downloadpuppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.tar.gz
puppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.tar.xz
puppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.zip
Merge commit 'turnbull/0.24.x' into 0.24.x
Diffstat (limited to 'lib/puppet/network')
-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