summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-03-06 10:12:08 +0545
committerPhil Davis <phil.davis@inf.org>2015-03-06 10:12:08 +0545
commita97a77a2a52184476e78e6f697b8d44706eb5692 (patch)
tree4b6305302cb6025cd1c9a6622ede5169bbdbacb3 /etc
parentf54229df8cb7d80f0da888dd04001e732470b1d0 (diff)
downloadpfsense-a97a77a2a52184476e78e6f697b8d44706eb5692.zip
pfsense-a97a77a2a52184476e78e6f697b8d44706eb5692.tar.gz
Be nicer when checking if alias is numeric
Because an ordinary port can be numeric here. Forum https://forum.pfsense.org/index.php?topic=89906.0
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/util.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 2f0b318..6dc24de 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1533,11 +1533,11 @@ function alias_get_type($name) {
function alias_expand($name) {
global $aliastable;
- // alias names cannot be strictly numeric. redmine #4289
- if (is_numericint($name))
- return null;
-
if (isset($aliastable[$name])) {
+ // alias names cannot be strictly numeric. redmine #4289
+ if (is_numericint($name)) {
+ return null;
+ }
return "\${$name}";
} else if (is_ipaddr($name) || is_subnet($name) || is_port($name) || is_portrange($name)) {
return "{$name}";
OpenPOWER on IntegriCloud