From 94d2cf4cff79138a836b27f626ee94485e58adec Mon Sep 17 00:00:00 2001 From: ftimme Date: Fri, 14 Sep 2012 14:01:49 +0000 Subject: [PATCH] - Make sure ISPConfig doesn't overwrite the system's motd file when creating a chrooted cron job. --- server/plugins-available/cron_jailkit_plugin.inc.php | 4 ++-- server/plugins-available/shelluser_jailkit_plugin.inc.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php index 1e4713846..f0c96b36d 100644 --- a/server/plugins-available/cron_jailkit_plugin.inc.php +++ b/server/plugins-available/cron_jailkit_plugin.inc.php @@ -236,7 +236,7 @@ class cron_jailkit_plugin { $tpl->setVar('home_dir',$this->_get_home_dir("")); $bashrc = escapeshellcmd($this->parent_domain['document_root']).'/etc/bash.bashrc'; - if(@is_file($bashrc)) unlink($bashrc); + if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc); file_put_contents($bashrc,$tpl->grab()); unset($tpl); @@ -249,7 +249,7 @@ class cron_jailkit_plugin { $tpl->setVar('domain',$this->parent_domain['domain']); $motd = escapeshellcmd($this->parent_domain['document_root']).'/var/run/motd'; - if(@is_file($motd)) unlink($motd); + if(@is_file($motd) || @is_link($motd)) unlink($motd); file_put_contents($motd,$tpl->grab()); diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index 322b1ba34..d0487d15e 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -227,12 +227,12 @@ class shelluser_jailkit_plugin { $tpl->setVar('home_dir',$this->_get_home_dir("")); $bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc'; - if(@is_file($bashrc)) unlink($bashrc); + if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc); file_put_contents($bashrc,$tpl->grab()); unset($tpl); - $this->app->log("Added bashrc scrpt : ".$bashrc,LOGLEVEL_DEBUG); + $this->app->log("Added bashrc script : ".$bashrc,LOGLEVEL_DEBUG); $tpl = new tpl(); $tpl->newTemplate("motd.master"); @@ -240,7 +240,7 @@ class shelluser_jailkit_plugin { $tpl->setVar('domain',$web['domain']); $motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd'; - if(@is_file($motd)) unlink($motd); + if(@is_file($motd) || @is_link($motd)) unlink($motd); file_put_contents($motd,$tpl->grab()); -- GitLab