From e1bf0e15e97ed9a4cb49d813df65d04f8f06c501 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Tue, 30 Aug 2005 14:29:39 +0000
Subject: fixing bug where remote server name is ignored

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@616 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/client.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

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
-- 
cgit