]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Fix gid insync regex for converting to GID
authorFélix-Antoine Fortin <felix-antoine.fortin@calculquebec.ca>
Fri, 1 Oct 2021 18:11:39 +0000 (14:11 -0400)
committerFélix-Antoine Fortin <felix-antoine.fortin@calculquebec.ca>
Fri, 1 Oct 2021 18:11:39 +0000 (14:11 -0400)
lib/puppet/type/firewall.rb

index ffbfcb1b2dd34f3e7ae41eb946e28b83738f3023..75724f75fe7440a00f559874225fe1e2e2c6bf7b 100644 (file)
@@ -1442,14 +1442,14 @@ Puppet::Type.newtype(:firewall) do
       # If 'should' contains anything other than digits,
       # we assume that we have to do a lookup to convert
       # to UID
-      unless should[%r{[0-9]+}] == should
+      unless should[%r{[0-9]+(-[0-9]+)?}] == should
         should = Etc.getgrnam(should).gid
       end
 
       # If 'is' contains anything other than digits,
       # we assume that we have to do a lookup to convert
       # to UID
-      unless is[%r{[0-9]+}] == is
+      unless is[%r{[0-9]+(-[0-9]+)?}] == is
         is = Etc.getgrnam(is).gid
       end