tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-09-29 Junichi Satoh <junichi@rworks.jp> 

* include/ajax/events.php: Added timeout binary paths to execute
	commands for FreeBSD and NetBSD.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8824 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2013-09-29 13:22:53 +00:00
parent c8e012b654
commit c644f82125
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-09-29 Junichi Satoh <junichi@rworks.jp>
* include/ajax/events.php: Added timeout binary paths to execute
commands for FreeBSD and NetBSD.
2013-09-29 Junichi Satoh <junichi@rworks.jp> 2013-09-29 Junichi Satoh <junichi@rworks.jp>
* include/functions_reporting.php: Added missing %s. * include/functions_reporting.php: Added missing %s.

13
pandora_console/include/ajax/events.php
View File

@ -121,7 +121,18 @@ if ($perform_event_response) {
$command = get_parameter('target',''); $command = get_parameter('target','');
echo system('/usr/bin/timeout 10 '.io_safe_output($command).' 2>&1'); switch (PHP_OS) {
case "FreeBSD":
$timeout_bin = '/usr/local/bin/gtimeout';
break;
case "NetBSD":
$timeout_bin = '/usr/pkg/bin/gtimeout';
break;
default:
$timeout_bin = '/usr/bin/timeout';
break;
}
echo system($timeout_bin . ' 10 '.io_safe_output($command).' 2>&1');
return; return;
} }