From 6c6499c2fe335e34a11e4f231c9cd5d054d48288 Mon Sep 17 00:00:00 2001 From: Simon Mott Date: Tue, 25 Apr 2017 21:36:52 +0100 Subject: [PATCH] fix: Don't run ipmitool without knowing a type (#6504) --- includes/polling/ipmi.inc.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/includes/polling/ipmi.inc.php b/includes/polling/ipmi.inc.php index aee8633bcd..fb6142ca79 100644 --- a/includes/polling/ipmi.inc.php +++ b/includes/polling/ipmi.inc.php @@ -18,9 +18,15 @@ if (is_array($ipmi_rows)) { $remote = " -H " . $ipmi['host'] . " -U '" . $ipmi['user'] . "' -P '" . $ipmi['password'] . "' -L USER"; } - $results = external_exec($config['ipmitool'] . ' -I ' . $ipmi['type'] . ' -c ' . $remote . ' sdr 2>/dev/null'); - d_echo($results); - echo " done.\n"; + // Check to see if we know which IPMI interface to use + // so we dont use wrong arguments for ipmitool + if ($ipmi['type'] != '') { + $results = external_exec($config['ipmitool'] . ' -I ' . $ipmi['type'] . ' -c ' . $remote . ' sdr 2>/dev/null'); + d_echo($results); + echo " done.\n"; + } else { + echo " type not yet discovered.\n"; + } foreach (explode("\n", $results) as $row) { list($desc, $value, $type, $status) = explode(',', $row);