diff options
author | Renato Botelho <renato@netgate.com> | 2015-07-18 12:55:52 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-07-18 12:55:52 -0300 |
commit | ddd1a9f597f8797238abd6869a3e389b88378b08 (patch) | |
tree | e08a72fb7e71be929f1892f6b3e49902e7dce45f /etc/inc | |
parent | 9770931029f676b042e610108dab7fdae3229ef1 (diff) | |
parent | dd07956c5e99648039c7090a7d9ef5631d5d8c79 (diff) | |
download | pfsense-ddd1a9f597f8797238abd6869a3e389b88378b08.zip pfsense-ddd1a9f597f8797238abd6869a3e389b88378b08.tar.gz |
Merge pull request #1759 from phil-davis/patch-2
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/filter.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index ec65bad..7638a20 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -612,6 +612,7 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr $builtlist = ""; $urltable_nesting = ""; $aliasnesting[$name] = $name; + $alias_type = alias_get_type($name); foreach ($addresses as $address) { if (empty($address)) { continue; @@ -639,7 +640,7 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr $tmpline = filter_generate_nested_alias($name, $aliastable[$address], $aliasnesting, $aliasaddrnesting); } } else if (!isset($aliasaddrnesting[$address])) { - if (!is_ipaddr($address) && !is_subnet($address) && !is_port($address) && !is_portrange($address) && is_hostname($address)) { + if (!is_ipaddr($address) && !is_subnet($address) && !(($alias_type == 'port') && (is_port($address) || is_portrange($address))) && is_hostname($address)) { if (!isset($filterdns["{$address}{$name}"])) { $use_filterdns = true; $filterdns["{$address}{$name}"] = "pf {$address} {$name}\n"; |