diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-19 14:51:08 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-19 14:51:08 -0400 |
| commit | e4aa1eaed439b9732a14dc177d9a70c0de0ade8e (patch) | |
| tree | e374f9c72843ca125598ea266edaeb11637f0787 /etc | |
| parent | 12ac39e824b1d45dd061cb436d77af17b2c6491c (diff) | |
| parent | 43a68abc9d16878cedac8ffda46fc12af5bb18ef (diff) | |
| download | pfsense-e4aa1eaed439b9732a14dc177d9a70c0de0ade8e.zip pfsense-e4aa1eaed439b9732a14dc177d9a70c0de0ade8e.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/util.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 48b1de1..258700c 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -542,8 +542,7 @@ function is_validaliasname($name) { $reserved = array("port", "pass"); if (in_array($name, $reserved, true)) return; /* return NULL */ - - if (!preg_match("/[^a-zA-Z0-9_]/", $name)) + if (!preg_match("/[^a-zA-Z0-9_]/", $name) && (strlen($name) < 32)) return true; else return false; |
