diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-01 22:20:26 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-07-01 22:22:07 -0500 |
| commit | c1e010fb7dfe4666b3db3d958627f70f7325cf85 (patch) | |
| tree | 7fb80de6764b6d0e7111b51a9270e40a48c2f05f /lib/puppet/indirector/node | |
| parent | 4d22a95b571991eb47046c3b0103b2e733b2801d (diff) | |
| download | puppet-c1e010fb7dfe4666b3db3d958627f70f7325cf85.tar.gz puppet-c1e010fb7dfe4666b3db3d958627f70f7325cf85.tar.xz puppet-c1e010fb7dfe4666b3db3d958627f70f7325cf85.zip | |
Fixing the Node::Ldap.search method to use an indirection request.
I foolishly was just using the old-style api.
Added an integration test to catch this in the future.
Diffstat (limited to 'lib/puppet/indirector/node')
| -rw-r--r-- | lib/puppet/indirector/node/ldap.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb index 2f953bbcb..71d3e3b0e 100644 --- a/lib/puppet/indirector/node/ldap.rb +++ b/lib/puppet/indirector/node/ldap.rb @@ -53,8 +53,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap # Find more than one node. LAK:NOTE This is a bit of a clumsy API, because the 'search' # method currently *requires* a key. It seems appropriate in some cases but not others, # and I don't really know how to get rid of it as a requirement but allow it when desired. - def search(key, options = {}) - if classes = options[:class] + def search(request) + if classes = request.options[:class] classes = [classes] unless classes.is_a?(Array) filter = "(&(objectclass=puppetClient)(puppetclass=" + classes.join(")(puppetclass=") + "))" else |