From da9b711a2e3d2fdfaa095d2a43277da2d81240e6 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 17 Dec 2005 00:52:08 +0000 Subject: [PATCH] MFC 8487 Work around an interesting bug when using not in rules by expanding the alias value since we cannot add the ! directive into the already defined aliases at the top which already have { } surrounding it --- etc/inc/filter.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f12ca257d2..7125f6cf85 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1121,7 +1121,7 @@ function generate_user_filter_rule($rule, $ngcounter) { $not = ""; if (stristr($expsrc, "$")) - $src = "{$not} {$expsrc}"; + $src = "{$not} " . alias_expand_value($rule['source']['address']); else $src = "{ {$not} {$expsrc} }"; } @@ -1198,7 +1198,7 @@ function generate_user_filter_rule($rule, $ngcounter) { $not = ""; if (stristr($expdst, "$")) - $dst = "{$not} {$expdst}"; + $dst = "{$not} " . alias_expand_value($rule['destination']['address']); else $dst = "{ {$not} {$expdst} }"; } @@ -2139,4 +2139,4 @@ function return_vpn_subnet($adr) { return " # error - {$adr['network']} "; } -?> +?> \ No newline at end of file