summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-10-05 18:02:53 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-10-05 18:02:53 +0000
commitf6f7624a1f374e6945a37a32db3eb98487a2d72e (patch)
treee878dd5b920b90c0dd419513e7eb550155484c80 /etc/inc
parentd2a2ba9504179e14e66c8003fd5ceb5fd176eda1 (diff)
downloadpfsense-f6f7624a1f374e6945a37a32db3eb98487a2d72e.zip
pfsense-f6f7624a1f374e6945a37a32db3eb98487a2d72e.tar.gz
Only throw a filter error when a filter error really has occured.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/filter.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 5f1c741..7ed1a25 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -194,10 +194,12 @@ function filter_configure_sync() {
$line_split = split("\n", $rules_file);
if(is_array($line_split))
$line_error = "The line in question reads [{$line_number}]: {$line_split[$line_number-1]}";
- file_notice("filter_load", "There were error(s) loading the rules: {$rules_error} {$line_error}", "Filter Reload", "");
- log_error("There were error(s) loading the rules: {$rules_error} - {$line_error}");
- update_filter_reload_status("There were error(s) loading the rules: {$rules_error} - {$line_error}");
- return;
+ if($line_error and $line_number) {
+ file_notice("filter_load", "There where error(s) loading the rules: {$rules_error} {$line_error}", "Filter Reload", "");
+ log_error("There where error(s) loading the rules: {$rules_error} - {$line_error}");
+ update_filter_reload_status("There were error(s) loading the rules: {$rules_error} - {$line_error}");
+ return;
+ }
}
unlink_if_exists("/usr/local/pkg/pf/carp_sync_client.php");
OpenPOWER on IntegriCloud