From da1a7c0cba1e12ff58ff871b6098905185fa67fc Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 28 Jun 2009 05:10:34 -0400
Subject: [PATCH] Reset action variable to an empty string after update.
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 11f4ab1..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();
@@ -234,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