diff --git a/README.md b/README.md index 7a3c13a..62cac0e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A Puppet function to query LDAP. ## Dependencies -The Ruby `net-ldap` gem is required to communicate with LDAP. The current version of net-ldap requires ruby 2.0.0. If you run your master with puppetserver you have to use version 0.12.1 which is the last version compatible with ruby 1.9 which is used by puppetserver. To install this use the following command: `puppetserver gem install net-ldap -v 0.12.1` +The Ruby `net-ldap` gem is required to communicate with LDAP. To install this use the following command: `puppetserver gem install net-ldap`. Version 0.11.0 or newer of `net-ldap` is required. In some environments, when `ldapquery()` is used on Puppet Server, an error like the following may appear. diff --git a/lib/puppet_x/ldapquery.rb b/lib/puppet_x/ldapquery.rb index 6c31a37..e553cd1 100644 --- a/lib/puppet_x/ldapquery.rb +++ b/lib/puppet_x/ldapquery.rb @@ -114,7 +114,7 @@ module PuppetX Puppet.debug("ldapquery(): Searching #{@base} for #{@attributes} using #{@filter} took #{time_delta} seconds and returned #{entries.length} results") entries - rescue Net::LDAP::LdapError => e + rescue Net::LDAP::Error => e Puppet.debug("There was an error searching LDAP #{e.message}") Puppet.debug('Returning false') false