diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-04-01 09:58:36 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-04-01 09:58:36 +1100 |
| commit | 4a39d64180377d12d994110cd38b350282863892 (patch) | |
| tree | 0076cb1a3229cb8afa4e20d682743ab854036bd7 /lib/puppet/network/xmlrpc | |
| parent | 2cac600de8496b39e698c2363e1faa26ab3705da (diff) | |
| download | puppet-4a39d64180377d12d994110cd38b350282863892.tar.gz puppet-4a39d64180377d12d994110cd38b350282863892.tar.xz puppet-4a39d64180377d12d994110cd38b350282863892.zip | |
Revert "Added updated fix for #1020"
This reverts commit 4f8df9803a9ad2f31d3e86418732a230b5cee3f3.
Diffstat (limited to 'lib/puppet/network/xmlrpc')
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index b55511871..f6a5e8db6 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -48,11 +48,7 @@ module Puppet::Network Puppet.warning "Transient SSL write error; restarting connection and retrying" self.recycle_connection retry - 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 + end raise XMLRPCClientError, "Certificates were not trusted: %s" % detail rescue ::XMLRPC::FaultException => detail |