maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- fixed some left-overs when using safe_exec which have not been escaped correctly, fixes #136

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-04-12 05:49:16 +00:00
parent b11d0c5cd9
commit 0d3df6e1fe
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cron_init.php
View File

@@ -75,7 +75,7 @@ while($fName = readdir($lockDirHandle))
// Check if cron is running or has died. // Check if cron is running or has died.
$check_pid = substr(strstr($fName, "-"), 1); $check_pid = substr(strstr($fName, "-"), 1);
system("kill -CHLD " . $check_pid . " 1> /dev/null 2> /dev/null", $check_pid_return); system("kill -CHLD " . (int)$check_pid . " 1> /dev/null 2> /dev/null", $check_pid_return);
if($check_pid_return == 1) if($check_pid_return == 1)
{ {

2
scripts/jobs/cron_tasks.inc.dns.10.bind.php
View File

@@ -137,7 +137,7 @@ class bind
fclose($bindconf_file_handler); fclose($bindconf_file_handler);
fwrite($this->debugHandler, ' cron_tasks: Task4 - froxlor_bind.conf written' . "\n"); fwrite($this->debugHandler, ' cron_tasks: Task4 - froxlor_bind.conf written' . "\n");
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written'); $this->logger->logAction(CRON_ACTION, LOG_INFO, 'froxlor_bind.conf written');
safe_exec($this->settings['system']['bindreload_command']); safe_exec(escapeshellcmd($this->settings['system']['bindreload_command']));
fwrite($this->debugHandler, ' cron_tasks: Task4 - Bind9 reloaded' . "\n"); fwrite($this->debugHandler, ' cron_tasks: Task4 - Bind9 reloaded' . "\n");
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded'); $this->logger->logAction(CRON_ACTION, LOG_INFO, 'Bind9 reloaded');
$domains_dir = makeCorrectDir($this->settings['system']['bindconf_directory'] . '/domains/'); $domains_dir = makeCorrectDir($this->settings['system']['bindconf_directory'] . '/domains/');

2
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -59,7 +59,7 @@ class apache
{ {
fwrite($this->debugHandler, ' apache::reload: reloading apache' . "\n"); fwrite($this->debugHandler, ' apache::reload: reloading apache' . "\n");
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading apache'); $this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading apache');
safe_exec($this->settings['system']['apachereload_command']); safe_exec(escapeshellcmd($this->settings['system']['apachereload_command']));
} }
/** /**

2
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -63,7 +63,7 @@ class lighttpd
{ {
fwrite($this->debugHandler, ' lighttpd::reload: reloading lighttpd' . "\n"); fwrite($this->debugHandler, ' lighttpd::reload: reloading lighttpd' . "\n");
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading lighttpd'); $this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading lighttpd');
safe_exec($this->settings['system']['apachereload_command']); safe_exec(escapeshellcmd($this->settings['system']['apachereload_command']));
} }
public function createIpPort() public function createIpPort()