From 81f72f5a83e5862cf28acbdc17cfc870105db90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Thu, 16 Feb 2023 13:45:24 -1000 Subject: [PATCH] Rename Net::LDAP::LdapError to Net::LDAP::Error The net-ldap gem deprecated `Net::LDAP::LdapError` and renamed it to `Net::LDAP::Error` starting with version 0.11 (released on Jan 21st, 2015). Version 0.17 (released on Nov 29th, 2020) removed the deprecaded `Net::LDAP::LdapError` class. Update the module to use the new class and unbreak the module when using a recent version of net-ldap. --- lib/puppet_x/ldapquery.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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