From 1e0033cf27640295a46d7eca61c6c3d1cc6d2b2e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 18 Nov 2008 13:12:26 -0500
Subject: [PATCH] - Updated jailkit installation instructions. Fixed a bug in ssh user plugin which resulted in a change of the shell to /bin/bash when a user was updated even when jailkit was enabled.

---
 server/plugins-available/shelluser_base_plugin.inc.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 3996d69..3ae2ef2 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -91,7 +91,7 @@
 			$command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
 			// $command .= ' --non-unique ';
 			$command .= ' --password '.escapeshellcmd($data['new']['password']);
-			$command .= ' --shell '.escapeshellcmd($data['new']['shell']);
+			if($data['new']['chroot'] != 'jailkit') $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
 			// $command .= ' --uid '.escapeshellcmd($uid);
 			$command .= ' --login '.escapeshellcmd($data['new']['username']);
 			$command .= ' '.escapeshellcmd($data['old']['username']);

--
Gitblit v1.9.1