diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-06-13 11:25:29 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-06-13 11:25:29 +1000 |
| commit | 28e4dd3ff65fba7ed4d8b211bd5920618c2025ea (patch) | |
| tree | 3c18400045c42f3acd62ae1ae116fc0377535d30 /lib/puppet | |
| parent | 6764af3c196a526647eb4a270ec737e2b0f20d36 (diff) | |
| parent | fb5f09bc347553b2744e5d3b24ddfa26bc0b3c9e (diff) | |
| download | puppet-28e4dd3ff65fba7ed4d8b211bd5920618c2025ea.tar.gz puppet-28e4dd3ff65fba7ed4d8b211bd5920618c2025ea.tar.xz puppet-28e4dd3ff65fba7ed4d8b211bd5920618c2025ea.zip | |
Merge branch 'ticket/0.24.x/1359' of git://github.com/lak/puppet into 0.24.x
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/indirector/indirection.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/indirector/request.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index 05464f8c9..4841ec532 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -267,7 +267,7 @@ class Puppet::Indirector::Indirection def check_authorization(request, terminus) # At this point, we're assuming authorization makes no sense without # client information. - return unless request.options[:node] + return unless request.node # This is only to authorize via a terminus-specific authorization hook. return unless terminus.respond_to?(:authorized?) diff --git a/lib/puppet/indirector/request.rb b/lib/puppet/indirector/request.rb index 45c06670b..98fa38885 100644 --- a/lib/puppet/indirector/request.rb +++ b/lib/puppet/indirector/request.rb @@ -24,6 +24,7 @@ class Puppet::Indirector::Request else result[param] = value end + result end if key.is_a?(String) or key.is_a?(Symbol) |