From e8671fd846bca061f89eb6720d286143b22110a5 Mon Sep 17 00:00:00 2001 From: Poil Date: Tue, 28 Mar 2017 16:43:32 +0200 Subject: [PATCH] cn can be in uppercase On my host : slapcat -b cn=config -a "(|(olcDatabase=monitor)(olcDatabase={0}config)(&(objectClass=olcDatabaseConfig)(|(objectClass=olcBdbConfig)(objectClass=olcHdbConfig)(objectClass=olcMdbConfig)(objectClass=olcMonitorConfig)(objectClass=olcRelayConfig))))" |grep -e ^olcDatabase olcDatabase: {0}config olcDatabase: {1}mdb olcDatabase: {2}Monitor --- lib/puppet/provider/openldap_database/olc.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/provider/openldap_database/olc.rb b/lib/puppet/provider/openldap_database/olc.rb index 65f01d58..17a003ad 100644 --- a/lib/puppet/provider/openldap_database/olc.rb +++ b/lib/puppet/provider/openldap_database/olc.rb @@ -36,7 +36,7 @@ def self.instances paragraph.gsub("\n ", "").split("\n").collect do |line| case line when /^olcDatabase: / - index, backend = line.match(/^olcDatabase: \{(\d+)\}(bdb|hdb|mdb|monitor|config|relay)$/).captures + index, backend = line.match(/^olcDatabase: \{(\d+)\}(bdb|hdb|mdb|monitor|config|relay)$/i).captures when /^olcDbDirectory: / directory = line.split(' ')[1] when /^olcRootDN: / @@ -98,11 +98,11 @@ def self.instances end end end - if backend == 'monitor' and !suffix - suffix = 'cn=monitor' + if backend.match(/monitor/i) and !suffix + suffix = "cn=#{backend}" end - if backend == 'config' and !suffix - suffix = 'cn=config' + if backend.match(/config/i) and !suffix + suffix = "cn=#{backend}" end new( :ensure => :present,