(#14455) Support interface names containing "+"

Previously iniface and outiface wouldn't allow + in the interface names. This
patch fixes that.

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index a5cc87201fd035a6f776877ee1ea243eca5e460e..59db2eaa739cf9943feb7199938938587714f2ca 100644 (file)
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -295,14 +295,14 @@ Puppet::Type.newtype(:firewall) do
     desc <<-EOS
       Input interface to filter on.
     EOS
-    newvalues(/^[a-zA-Z0-9\-\._]+$/)
+    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
   end
 
   newproperty(:outiface, :required_features => :interface_match) do
     desc <<-EOS
       Output interface to filter on.
     EOS
-    newvalues(/^[a-zA-Z0-9\-\._]+$/)
+    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
   end
 
   # NAT specific properties