diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-12-04 16:20:15 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-12-04 16:20:15 -0600 |
| commit | c44f2a4a14977cfdeb921ae22cebddcb1d36a4d9 (patch) | |
| tree | f905c8ce2536a2c96e6cb610af61890103d100c6 | |
| parent | 7039bd10d12d81879d7a1c03d4e4cd5fa3aab938 (diff) | |
| parent | 3fa5e6c4d7c580e8efce6f5e498dce46d7a43cd7 (diff) | |
| download | pfsense-packages-c44f2a4a14977cfdeb921ae22cebddcb1d36a4d9.tar.gz pfsense-packages-c44f2a4a14977cfdeb921ae22cebddcb1d36a4d9.tar.bz2 pfsense-packages-c44f2a4a14977cfdeb921ae22cebddcb1d36a4d9.zip | |
Merge pull request #1206 from doktornotor/patch-2
| -rw-r--r-- | config/pfblockerng/pfblockerng.inc | 1 | ||||
| -rw-r--r-- | config/pfblockerng/pfblockerng.php | 4 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 69e010d3..c0e81b27 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -200,6 +200,7 @@ function pfb_global() { $pfb['dnsbl'] = $pfb['dnsblconfig']['pfb_dnsbl']; // Enabled state of DNSBL $pfb['dnsbl_port'] = $pfb['dnsblconfig']['pfb_dnsport'] ?: ''; // Lighttpd web server http port setting $pfb['dnsbl_port_ssl'] = $pfb['dnsblconfig']['pfb_dnsport_ssl']?: ''; // Lighttpd web server https port setting + $pfb['dnsbl_alexa'] = $pfb['dnsblconfig']['alexa_enable']; // Alexa whitelist // Restore previous download on failure (default to 'on') $pfb['restore'] = $pfb['config']['restore_feed'] != '' ? $pfb['config']['restore_feed'] : 'on'; diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php index d71fdff8..8a368d2e 100644 --- a/config/pfblockerng/pfblockerng.php +++ b/config/pfblockerng/pfblockerng.php @@ -108,7 +108,7 @@ if (in_array($argv[1], array('update', 'updateip', 'updatednsbl', 'dc', 'bu', 'u } // Skip Alexa update, if disabled - if ($pfb['dnsbl_alexa'] == 'Disabled') { + if ($pfb['dnsbl_alexa'] != 'on') { unset($pfb['extras'][5]); } @@ -1547,4 +1547,4 @@ EOF; // Unset arrays unset ($roptions4, $et_options, $xmlrep); } -?>
\ No newline at end of file +?> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 98650ef7..20de98f8 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -118,7 +118,7 @@ <category>Security</category> <pkginfolink>https://forum.pfsense.org/index.php?topic=86212.0</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file> - <version>2.0.1</version> + <version>2.0.2</version> <status>RELEASE</status> <required_version>2.2</required_version> <maintainer>BBCan177@gmail.com</maintainer> |