From 94d2cf4cff79138a836b27f626ee94485e58adec Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 14 Sep 2012 10:01:49 -0400
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 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
index 1e47138..f0c96b3 100644
--- a/server/plugins-available/cron_jailkit_plugin.inc.php
+++ b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -236,7 +236,7 @@
                 $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 @@
 				$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());
 				

--
Gitblit v1.9.1