diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-11-19 15:49:31 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-11-19 15:49:31 +0545 |
| commit | 2073c2d58531c00682aa1d9dc889e51443078e3c (patch) | |
| tree | c8b6c417e4d73bde01eccbf49b6420b80852d076 /src/etc/inc | |
| parent | b8ecbcb46eba338787d7bede16d00ba50c8bc6f3 (diff) | |
| download | pfsense-2073c2d58531c00682aa1d9dc889e51443078e3c.zip pfsense-2073c2d58531c00682aa1d9dc889e51443078e3c.tar.gz | |
Fix old SNMP bindlan setting - Redmine #3883
Remove run-time code in services.inc that referenced "bindlan".
Provide upgrade code to convert bindlan to bindip="lan" if needed.
Update current config version.
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/services.inc | 10 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 13 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 5768f59..18eabf8 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -71,7 +71,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "12.7", + "latest_config" => "12.8", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 27c0bcf..3b37bd2 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2277,10 +2277,6 @@ begemotSnmpdCommunityDisable = 1 EOD; - if (isset($config['snmpd']['bindlan'])) { - $config['snmpd']['bindip'] = 'lan'; - unset($config['snmpd']['bindlan']); - } $bind_to_ip = "0.0.0.0"; if (isset($config['snmpd']['bindip'])) { if (is_ipaddr($config['snmpd']['bindip'])) { @@ -2377,13 +2373,9 @@ EOD; fclose($fd); unset($snmpdconf); - if (isset($config['snmpd']['bindlan'])) { - $bindlan = ""; - } - /* run bsnmpd */ mwexec("/usr/sbin/bsnmpd -c {$g['varetc_path']}/snmpd.conf" . - "{$bindlan} -p {$g['varrun_path']}/snmpd.pid"); + " -p {$g['varrun_path']}/snmpd.pid"); if (platform_booting()) { echo gettext("done.") . "\n"; diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 46c4ae9..06293c6 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4089,4 +4089,17 @@ function upgrade_126_to_127() { } +function upgrade_127_to_128() { + global $config; + + // If bindip is not already specified then migrate the old SNMP bindlan flag to a bindip setting + if (isset($config['snmpd']['bindlan'])) { + if (!isset($config['snmpd']['bindip'])) { + $config['snmpd']['bindip'] = 'lan'; + } + unset($config['snmpd']['bindlan']); + } + +} + ?> |
