summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/client.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb
index 7ea7db3e8..3b47d10e8 100644
--- a/lib/puppet/client.rb
+++ b/lib/puppet/client.rb
@@ -175,12 +175,8 @@ module Puppet
$nonetworking)
end
- args = {}
- [:Port, :Server].each { |arg|
- if hash.include?(:Port)
- args[arg] = hash[arg]
- end
- }
+ args = {:Server => hash[:Server]}
+ args[:Port] == hash[:Port] || Puppet[:masterport]
if self.readcert
args[:Certificate] = @cert