diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-09-14 11:17:43 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-09-14 11:17:43 -0300 |
commit | 67e5e3c6dbf7aa05a4b4fbaa2ebcee8328aa5648 (patch) | |
tree | a5e19399b5e1a839d2b1e92a58a6b5d52549bf88 | |
parent | 81ce28d87039d21c8b03986362d9f2ccffe6d407 (diff) | |
download | pfsense-67e5e3c6dbf7aa05a4b4fbaa2ebcee8328aa5648.zip pfsense-67e5e3c6dbf7aa05a4b4fbaa2ebcee8328aa5648.tar.gz |
Set action = pass for configured mac addresses on CP passtrumac
-rw-r--r-- | conf.default/config.xml | 2 | ||||
-rw-r--r-- | etc/inc/globals.inc | 2 | ||||
-rw-r--r-- | etc/inc/upgrade_config.inc | 15 |
3 files changed, 17 insertions, 2 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 2996d34..5287964 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- pfSense default system configuration --> <pfsense> - <version>9.8</version> + <version>9.9</version> <lastchange></lastchange> <theme>pfsense_ng</theme> <sysctl> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 628ac9f..9cb9fad 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -72,7 +72,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "9.8", + "latest_config" => "9.9", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 8093ff3..1c17215 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3142,4 +3142,19 @@ function upgrade_097_to_098() { /* Disable kill_states by default */ $config['system']['kill_states'] = true; } + +function upgrade_098_to_099() { + global $config, $g; + + if (!is_array($config['captiveportal'])) + return; + + foreach ($config['captiveportal'] as $cpzone => $cp) { + if (!is_array($cp['passthrumac'])) + continue; + + foreach ($cp['passthrumac'] as $idx => $passthrumac) + $config['captiveportal'][$cpzone]['passthrumac'][$idx]['action'] = 'pass'; + } +} ?> |