diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-30 14:29:39 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2005-08-30 14:29:39 +0000 |
| commit | e1bf0e15e97ed9a4cb49d813df65d04f8f06c501 (patch) | |
| tree | a0f827719db317603bebd0b9daff0cf89a7309df /lib | |
| parent | e1de0028f73cb5eb5a8ccbc45d96940d1c7c470f (diff) | |
| download | puppet-e1bf0e15e97ed9a4cb49d813df65d04f8f06c501.tar.gz puppet-e1bf0e15e97ed9a4cb49d813df65d04f8f06c501.tar.xz puppet-e1bf0e15e97ed9a4cb49d813df65d04f8f06c501.zip | |
fixing bug where remote server name is ignored
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@616 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/client.rb | 8 |
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 |