From a03974a3fa042bbffd867cdc52970a26dae6fb85 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Wed, 11 Mar 2015 10:07:25 -0300
Subject: Add a log message when hostres SNMP module is ignored on APU boards

---
 etc/inc/services.inc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index a1521a3..c3e2fe2 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -2272,16 +2272,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
-- 
cgit v1.1