From 48d6105a64015ad0f547da90da150b030cbb26fd Mon Sep 17 00:00:00 2001 From: BBcan177 Date: Mon, 25 May 2015 00:10:23 -0400 Subject: pfBlockerNG v1.09 Maxmind Cron Task and addedit_string The cron comparison function must skip the hour comparison for the Maxmind Cron task due to the hour being randomized (0-23). Add "addedit_string" to XML files. This will give description to the config backups. --- config/pfblockerng/pfblockerng.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config/pfblockerng/pfblockerng.inc') diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index b67f681f..379ce223 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -263,6 +263,10 @@ function pfblockerng_cron_exists($crontask, $pfb_min, $pfb_hour) { if ($item['minute'] != $pfb_min) { return FALSE; } + if ($pfb_hour == 'maxmind' && !empty($item['hour'])) { + // Maxmind hour is randomized. Skip comparison. + return TRUE; + } if ($item['hour'] != $pfb_hour) { return FALSE; } @@ -2662,7 +2666,7 @@ function sync_package_pfblockerng($cron = "") { $pfb_gwho = "root"; // Determine if Cron Task requires updating - if (!pfblockerng_cron_exists($pfb_gcmd, $pfb_gmin, $pfb_ghour)) { + if (!pfblockerng_cron_exists($pfb_gcmd, $pfb_gmin, 'maxmind')) { install_cron_job($pfb_gcmd, true, $pfb_gmin, $pfb_ghour, $pfb_gmday, $pfb_gmonth, $pfb_gwday, $pfb_gwho); } } -- cgit v1.2.3