diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 10:05:38 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-03-11 10:05:38 -0300 |
| commit | 3d50cb09c62cd068ae27c5556616b503f08e279a (patch) | |
| tree | bd72f838cf0be97ca6e83e07ca8621897fe65822 | |
| parent | 9f9bdb77f35667586c78f8fa3c5a12c11c8c1085 (diff) | |
| download | pfsense-3d50cb09c62cd068ae27c5556616b503f08e279a.zip pfsense-3d50cb09c62cd068ae27c5556616b503f08e279a.tar.gz | |
Add a log message when hostres SNMP module is ignored on APU boards
| -rw-r--r-- | etc/inc/services.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index d915d07..9df8334 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -2114,15 +2114,19 @@ begemotSnmpdModulePath."pf" = "/usr/lib/snmp_pf.so" EOD; } - /* XXX: hostres module crashes APU - ticket #4403 */ - $specplatform = system_identify_specific_platform(); - if(isset($config['snmpd']['modules']['hostres']) && $specplatform['name'] != 'APU') { - $snmpdconf .= <<<EOD + if(isset($config['snmpd']['modules']['hostres'])) { + /* XXX: hostres module crashes APU - ticket #4403 */ + $specplatform = system_identify_specific_platform(); + if ($specplatform['name'] == 'APU') { + log_error("'Host Resources' SNMP module was ignored because it can potentially crash system on APU boards"); + } else { + $snmpdconf .= <<<EOD begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so" EOD; + } + unset($specplatform); } - unset($specplatform); if(isset($config['snmpd']['modules']['bridge'])) { $snmpdconf .= <<<EOD |
