From 9dbd2840fa0a4626b3124deafdd61fc13f81ecce Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 5 Mar 2009 18:59:35 +0000
Subject: [PATCH]
---
server/mods-available/monitor_core_module.inc.php | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index beecd8ab41..c6518eef60 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -605,8 +605,8 @@ class monitor_core_module {
$type = 'raid_state';
/* This monitoring is only available if mdadm is installed */
- $location = shell_exec('which mdadm');
- if($location != ''){
+ $location = system('which mdadm', $retval);
+ if($retval === 0){
/*
* Fetch the output
*/
@@ -709,8 +709,8 @@ class monitor_core_module {
$type = 'rkhunter';
/* This monitoring is only available if rkhunter is installed */
- $location = shell_exec('which rkhunter');
- if($location != ''){
+ $location = system('which rkhunter', $retval);
+ if($retval === 0){
/*
* Fetch the output
*/
@@ -763,9 +763,9 @@ class monitor_core_module {
$type = 'log_fail2ban';
/* This monitoring is only available if fail2ban is installed */
- $location = shell_exec('which fail2ban-client'); // Debian & Ubuntu
- if($location == '') $location = shell_exec('which fail2ban'); // CentOS & Fedora
- if($location != ''){
+ $location = system('which fail2ban-client', $retval); // Debian & Ubuntu
+ if($retval !== 0) $location = system('which fail2ban', $retval); // CentOS & Fedora
+ if($retval === 0){
/* Get the data of the log */
$data = $this->_getLogData($type);
--
GitLab