diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2011-03-06 16:18:29 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2011-03-06 16:18:29 -0500 |
| commit | b4c826ad15331aeb4177b0c2be532baa479b29e8 (patch) | |
| tree | 6fa270511f1483070d3a1628b62fe5508c6f2ba2 /etc/inc/util.inc | |
| parent | 283e918079536f7f5fda6cb4866fd82f4ec4421e (diff) | |
| parent | fd4151a94762618d85c446f2140a06f41feef4b6 (diff) | |
| download | pfsense-b4c826ad15331aeb4177b0c2be532baa479b29e8.zip pfsense-b4c826ad15331aeb4177b0c2be532baa479b29e8.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index ced3085..cf531ce 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -532,7 +532,7 @@ function is_domain($domain) { /* returns true if $macaddr is a valid MAC address */ function is_macaddr($macaddr) { - return preg_match('/^[0-9A-F]{2}(?=([:]?))(?:\\1[0-9A-F]{2}){5}$/i', $macaddr) == 1 ? true : false; + return preg_match('/^[0-9A-F]{2}(?:[:][0-9A-F]{2}){5}$/i', $macaddr) == 1 ? true : false; } /* returns true if $name is a valid name for an alias */ |
