diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-18 12:53:10 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-18 12:53:46 -0400 |
| commit | 7171b7b65dfe9b4a93220b31d689c0fa7e1da40e (patch) | |
| tree | 516a050e47a058be342a464ce0ff404ba636b459 /etc | |
| parent | 0d5c21f743a7ad133e18b3dc7ee09ac8073f4d08 (diff) | |
| download | pfsense-7171b7b65dfe9b4a93220b31d689c0fa7e1da40e.zip pfsense-7171b7b65dfe9b4a93220b31d689c0fa7e1da40e.tar.gz | |
Fix PPTP server radius settings upgrade from 1.2.3. Fixes #1292
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 2168765..7037933 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -91,7 +91,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "7.7", + "latest_config" => "7.8", "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 3e280d3..1d88880 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2455,4 +2455,21 @@ function upgrade_076_to_077() { } } +function upgrade_077_to_078() { + if (is_array($config['pptpd']) && is_array($config['pptpd']['radius']) + && !is_array($config['pptpd']['radius']['server'])) { + $radarr = array(); + $radsvr = array(); + $radsvr['ip'] = $config['pptpd']['radius']['server']; + $radsvr['secret'] = $config['pptpd']['radius']['secret']; + $radsvr['port'] = 1812; + $radsvr['acctport'] = 1813; + $radsvr['enable'] = isset($config['pptpd']['radius']['enable']); + $radarr['accounting'] = isset($config['pptpd']['radius']['accounting']); + if ($radarr['accounting']) + $radarr['acct_update'] = $radsvr['ip']; + $radarr['server'] = $radsvr; + $config['pptpd']['radius'] = $radarr; + } +} ?> |
