diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-03-31 09:10:10 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-03-31 09:10:10 +1100 |
| commit | 4f8df9803a9ad2f31d3e86418732a230b5cee3f3 (patch) | |
| tree | 3e6b818e57c4abf0f64eb39788363d3496cf1e97 | |
| parent | aa830b9b34f4d7eb39f5de9cca7ba848f851db2d (diff) | |
| download | puppet-4f8df9803a9ad2f31d3e86418732a230b5cee3f3.tar.gz puppet-4f8df9803a9ad2f31d3e86418732a230b5cee3f3.tar.xz puppet-4f8df9803a9ad2f31d3e86418732a230b5cee3f3.zip | |
Added updated fix for #1020
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index f6a5e8db6..b55511871 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -48,7 +48,11 @@ module Puppet::Network Puppet.warning "Transient SSL write error; restarting connection and retrying" self.recycle_connection retry - end + elsif detail.message =~ /certificate verify failed/ || /hostname was not match/ || /hostname not match/ + Puppet.warning "Certificate verification failed; consider using the certname configuration option" + self.recycle_connection + retry + end raise XMLRPCClientError, "Certificates were not trusted: %s" % detail rescue ::XMLRPC::FaultException => detail |