From 67f7b203af2f42fd2585cb2fbd9824eb51d92ac2 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 15 May 2005 22:47:08 +0000 Subject: [PATCH] "and" not "&" - I'm sure this wasn't meant to be a bitwise and...it's a miracle this parsed, let alone worked! --- etc/inc/filter.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 7b17457f3b..52c86fa737 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1327,16 +1327,16 @@ function generate_user_filter_rule($rule, $ngcounter) { isset($rule['max-src-conn-rates']) and $rule['max-src-conn-rates'] <> "" or isset($rule['max-src-states']) and $rule['max-src-states'] <> "" ) { $line .= "( "; - if(isset($rule['source-track']) & $rule['source-track'] <> "") + if(isset($rule['source-track']) and $rule['source-track'] <> "") $line .= "source-track rule "; - if(isset($rule['max-src-nodes']) & $rule['max-src-nodes'] <> "") + if(isset($rule['max-src-nodes']) and $rule['max-src-nodes'] <> "") $line .= "max-src-nodes " . $rule['max-src-nodes'] . " "; - if(isset($rule['max-src-states']) & $rule['max-src-states'] <> "") + if(isset($rule['max-src-states']) and $rule['max-src-states'] <> "") $line .= "max-src-states " . $rule['max-src-states'] . " "; - if(isset($rule['statetimeout']) & $rule['statetimeout'] <> "") + if(isset($rule['statetimeout']) and $rule['statetimeout'] <> "") $line .= "tcp.established " . $rule['statetimeout'] . " "; - if(isset($rule['max-src-conn-rate']) & $rule['max-src-conn-rate'] <> "" - and isset($rule['max-src-conn-rates']) & $rule['max-src-conn-rates'] <> "") { + if(isset($rule['max-src-conn-rate']) and $rule['max-src-conn-rate'] <> "" + and isset($rule['max-src-conn-rates']) and $rule['max-src-conn-rates'] <> "") { $line .= "max-src-conn-rate " . $rule['max-src-conn-rate'] . " "; $line .= "/" . $rule['max-src-conn-rates'] . ", overload flush global "; } @@ -1858,4 +1858,4 @@ function process_carp_rules() { return $lines; } -?> \ No newline at end of file +?>