From 44d2a76d4611e27d348e1c8ed89ff0675f2d262f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 27 May 2009 08:49:48 -0400
Subject: [PATCH] Added missing error messages to the dns wizard. Improved language file loading.
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 308178f..13705c0 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -87,7 +87,7 @@
$this->_setup_jailkit_chroot();
- $command .= 'usermod --unlock '.escapeshellcmd($data['new']['username']);
+ $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command);
$this->_add_jailkit_user();
@@ -151,8 +151,12 @@
//commented out proved to be dangerous on config errors
//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
-
- $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+ if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
+ $command = 'userdel -f -r';
+ $command .= ' '.escapeshellcmd($data['old']['username']);
+ exec($command);
+ $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+ }
}
$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -230,6 +234,9 @@
$jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']);
$jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']);
+ if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc');
+ if(!is_file($this->data['new']['dir'].'/etc/passwd')) exec('touch '.$this->data['new']['dir'].'/etc/passwd');
+
// IMPORTANT!
// ALWAYS create the user. Even if the user was created before
// if we check if the user exists, then a update (no shell -> jailkit) will not work
--
Gitblit v1.9.1