- Make sure ISPConfig doesn't overwrite the system's motd file when creating a chrooted cron job.

Author: falkotimme

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -236,7 +236,7 @@ function _setup_jailkit_chroot()
                 $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 @@ function _setup_jailkit_chroot()
 				$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());
 

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -227,20 +227,20 @@ function _setup_jailkit_chroot()
 				$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");
 
 				$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());