diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-05-23 08:05:32 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-05-23 08:05:32 -0300 |
| commit | 019e50313edca34c3a0875b2dc700b1a8fe43c80 (patch) | |
| tree | 3af64b6fa0b6574c6eb6db8370a133e4599f8f49 /etc | |
| parent | 5e2df7fc1c71c2e876e8eb1f99f7b3c8419ea72c (diff) | |
| download | pfsense-019e50313edca34c3a0875b2dc700b1a8fe43c80.zip pfsense-019e50313edca34c3a0875b2dc700b1a8fe43c80.tar.gz | |
Partial revert of 5b431a20dea since the introduced parameter is not working as expected
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index bad9087..b6dac30 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -492,7 +492,7 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr return $finallist; } -function filter_expand_alias($alias_name, $all = false) +function filter_expand_alias($alias_name) { global $config; @@ -501,19 +501,14 @@ function filter_expand_alias($alias_name, $all = false) if($aliased['name'] == $alias_name) { $aliasnesting = array(); $aliasaddrnesting = array(); - $result = filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting); - if ($all === true) - foreach ($aliasaddrnesting as $addr) - if (!preg_match("/\s*$addr\s*/", $result)) - $result .= " {$addr}"; - return $result; + return filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting); } } } } -function filter_expand_alias_array($alias_name, $all = false) { - $expansion = filter_expand_alias($alias_name, $all); +function filter_expand_alias_array($alias_name) { + $expansion = filter_expand_alias($alias_name); return explode(" ", preg_replace('/\s+/', ' ', trim($expansion))); } |
