From 42b3854f7ca1d2877d717d8cb8cbb2d5b1a9a3cc Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Mar 2009 13:06:19 -0500
Subject: [PATCH] Fixed jailkit scripts on fedora.
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index be18a9a..308178f 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -86,6 +86,10 @@
$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
$this->_setup_jailkit_chroot();
+
+ $command .= 'usermod --unlock '.escapeshellcmd($data['new']['username']);
+ exec($command);
+
$this->_add_jailkit_user();
}
@@ -184,7 +188,7 @@
$tpl->setVar('home_dir',$this->_get_home_dir(""));
$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
- exec('rm '.$bashrc);
+ if(@is_file($bashrc)) exec('rm '.$bashrc);
file_put_contents($bashrc,$tpl->grab());
unset($tpl);
@@ -197,7 +201,7 @@
$tpl->setVar('domain',$web['domain']);
$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
- exec('rm '.$motd);
+ if(@is_file($motd)) exec('rm '.$motd);
file_put_contents($motd,$tpl->grab());
--
Gitblit v1.9.1