From 196c29c28dae504277c93af9e9a341ecec26baa3 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Tue, 25 May 2010 11:11:55 -0400
Subject: [PATCH] installer: suppressed a warning, if the log-rotation-file is created the first time
---
server/plugins-available/shelluser_base_plugin.inc.php | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index c3e112c..d279678 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -89,9 +89,14 @@
$app->log("Executed command: ".$command,LOGLEVEL_DEBUG);
$app->log("Added shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
+ //* Create .bash_history file
+ exec('touch '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chmod 755 '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chown '.escapeshellcmd($data['new']['username']).':'.escapeshellcmd($data['new']['pgroup']).' '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+
//* Disable shell user temporarily if we use jailkit
if($data['new']['chroot'] == 'jailkit') {
- $command = 'usermod -L '.escapeshellcmd($data['new']['username']);
+ $command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']);
exec($command);
$app->log("Disabling shelluser temporarily: ".$command,LOGLEVEL_DEBUG);
}
@@ -128,6 +133,15 @@
exec($command);
$app->log("Executed command: $command ",LOGLEVEL_DEBUG);
$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
+
+
+ //* Create .bash_history file
+ if(!is_file($data['new']['dir']).'/.bash_history') {
+ exec('touch '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chmod 755 '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ exec('chown '.escapeshellcmd($data['new']['username']).':'.escapeshellcmd($data['new']['pgroup']).' '.escapeshellcmd($data['new']['dir']).'/.bash_history');
+ }
+
} else {
// The user does not exist, so we insert it now
$this->insert($event_name,$data);
--
Gitblit v1.9.1