diff options
Diffstat (limited to 'lib/puppet/network/xmlrpc')
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/webrick_servlet.rb | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index f12d279d4..c5efe985d 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -174,12 +174,15 @@ module Puppet::Network hash[:HTTPProxyPort] = nil end - super( + + super( + hash[:Server], hash[:Path], hash[:Port], hash[:HTTPProxyHost], hash[:HTTPProxyPort], + nil, # user nil, # password true, # use_ssl diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb index ec64c1c60..a03db01d1 100644 --- a/lib/puppet/network/xmlrpc/webrick_servlet.rb +++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb @@ -10,7 +10,7 @@ module Puppet::Network::XMLRPC # This is a hackish way to avoid an auth message every time we have a # normal operation def self.log(msg) - unless defined? @logs + unless defined?(@logs) @logs = {} end if @logs.include?(msg) @@ -84,8 +84,11 @@ module Puppet::Network::XMLRPC client = peer[2] clientip = peer[3] else - raise ::XMLRPC::FaultException.new( + + raise ::XMLRPC::FaultException.new( + ERR_UNCAUGHT_EXCEPTION, + "Could not retrieve client information" ) end @@ -103,8 +106,7 @@ module Puppet::Network::XMLRPC Puppet.warning "Could not retrieve server name from cert" else unless client == nameary[1] - Puppet.debug "Overriding %s with cert name %s" % - [client, nameary[1]] + Puppet.debug "Overriding %s with cert name %s" % [client, nameary[1]] client = nameary[1] end valid = true |