Merge pull request #465 from igalic/patch-1

simplify mac address regex
2015-05-30 14:33:27 +01:00 · 2015-05-30 14:33:27 +01:00 · 1ae9058518
commit 1ae9058518
parent 4a8c0a57f2 687600c30c
1 changed files with 1 additions and 1 deletions
--- a/lib/puppet/parser/functions/is_mac_address.rb
+++ b/lib/puppet/parser/functions/is_mac_address.rb
@ -15,7 +15,7 @@ Returns true if the string passed to this function is a valid mac address.

    mac = arguments[0]

-    if /^[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}$/.match(mac) then
+    if /^[a-f0-9]{1,2}(:[a-f0-9]{1,2}){5}$/i.match(mac) then
      return true
    else
      return false