diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-05-10 09:58:50 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-05-10 09:58:50 -0300 |
| commit | fcb1ccaf2d356148057e9a62a376ce3d4229e980 (patch) | |
| tree | 899e116ad17c750b5d86b198aeb5599b9b520144 /etc | |
| parent | 0d59cc942f2ee225eccdb375e25f58a6f04fa9c4 (diff) | |
| download | pfsense-fcb1ccaf2d356148057e9a62a376ce3d4229e980.zip pfsense-fcb1ccaf2d356148057e9a62a376ce3d4229e980.tar.gz | |
Revert "Fix alias expand for hostnames, it should fix #2941"
Working on a better fix
This reverts commit 0d59cc942f2ee225eccdb375e25f58a6f04fa9c4.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 9d8a47f..13963a8 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -473,12 +473,12 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr else if(!isset($aliasnesting[$address])) $tmpline = filter_generate_nested_alias($name, $aliastable[$address], $aliasnesting, $aliasaddrnesting); } else if(!isset($aliasaddrnesting[$address])) { - $aliasaddrnesting[$address] = $address; if (!is_ipaddr($address) && !is_subnet($address) && !is_port($address) && is_hostname($address)) { if (!isset($filterdns["{$address}{$name}"])) $filterdns["{$address}{$name}"] = "pf {$address} {$name}\n"; continue; } + $aliasaddrnesting[$address] = $address; $tmpline = " {$address}"; } if ((strlen($tmpline)+ $linelength) > 4036) { |
