Merge pull request #1019 from cmd-ntrf/bug11203

Bugfix MODULES-11203: error on second apply when uid or gid is specified as a range

Author: adrianiurca

lib/puppet/type/firewall.rb

@@ -1390,17 +1390,17 @@ def insync?(is)
         should_negate = '!'
       end
 
-      # If 'should' contains anything other than digits,
+      # If 'should' contains anything other than digits or digit range,
       # 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.getpwnam(should).uid
       end
 
-      # If 'is' contains anything other than digits,
+      # If 'is' contains anything other than digits or digit range,
       # 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.getpwnam(is).uid
       end
 
@@ -1439,17 +1439,17 @@ def insync?(is)
         should_negate = '!'
       end
 
-      # If 'should' contains anything other than digits,
+      # If 'should' contains anything other than digits or digit range,
       # we assume that we have to do a lookup to convert
-      # to UID
-      unless should[%r{[0-9]+}] == should
+      # to GID
+      unless should[%r{[0-9]+(-[0-9]+)?}] == should
         should = Etc.getgrnam(should).gid
       end
 
-      # If 'is' contains anything other than digits,
+      # If 'is' contains anything other than digits or digit range,
       # we assume that we have to do a lookup to convert
-      # to UID
-      unless is[%r{[0-9]+}] == is
+      # to GID
+      unless is[%r{[0-9]+(-[0-9]+)?}] == is
         is = Etc.getgrnam(is).gid
       end