From 10f57facc713101e8902d757bf446a028cf10a72 Mon Sep 17 00:00:00 2001 From: Dan Wainwright Date: Thu, 18 Jan 2024 13:24:38 +0200 Subject: [PATCH 1/2] each_values -> each_value ruby typo --- lib/puppet/provider/selinux_login/semanage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/selinux_login/semanage.rb b/lib/puppet/provider/selinux_login/semanage.rb index de52e95d..3502ca64 100644 --- a/lib/puppet/provider/selinux_login/semanage.rb +++ b/lib/puppet/provider/selinux_login/semanage.rb @@ -109,7 +109,7 @@ def self.prefetch(resources) resource.provider = provider resource[:ensure] = :present if provider.source == :policy else - resources.each_values do |res| + resources.each_value do |res| next unless res[:selinux_user] == provider.selinux_user && res[:selinux_login_name] == provider.selinux_login_name warning("Selinux_login['#{res[:name]}']: title does not match its login ('#{provider.name}' != '#{provider.selinux_login_name}')") From 9b82efdc9d64b0dcf2616d0974b62e9ef64c02e9 Mon Sep 17 00:00:00 2001 From: Dan Wainwright Date: Thu, 18 Jan 2024 14:56:15 +0200 Subject: [PATCH 2/2] selinux_login: Use correct name now the title is just the login name Now the title is just the login name we should be using the login name for comparisons. See 340c17e345d09d64289d35d4b1a18d533dfd3b40 --- lib/puppet/provider/selinux_login/semanage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/selinux_login/semanage.rb b/lib/puppet/provider/selinux_login/semanage.rb index 3502ca64..63d201ce 100644 --- a/lib/puppet/provider/selinux_login/semanage.rb +++ b/lib/puppet/provider/selinux_login/semanage.rb @@ -67,7 +67,7 @@ def self.parse_helper_lines(lines) # local %cn_cegbu_aconex_fr-dev-platform-priv unconfined_u source_str, selinux_login_name, selinux_user = split - key = "#{selinux_login_name}_#{selinux_user}" + key = selinux_login_name source = case source_str when 'policy' then :policy