From 1e0033cf27640295a46d7eca61c6c3d1cc6d2b2e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 18 Nov 2008 18:12:26 +0000
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.
---
INSTALL_CENTOS_5.2.txt | 11 +++++++----
INSTALL_DEBIAN_4.0.txt | 13 ++++++++-----
INSTALL_FEDORA_9.txt | 11 +++++++----
INSTALL_OPENSUSE_11.txt | 11 +++++++----
INSTALL_UBUNTU_8.04.txt | 13 ++++++++-----
.../plugins-available/shelluser_base_plugin.inc.php | 2 +-
6 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/INSTALL_CENTOS_5.2.txt b/INSTALL_CENTOS_5.2.txt
index 89ce78a928..f3821e8a0a 100644
--- a/INSTALL_CENTOS_5.2.txt
+++ b/INSTALL_CENTOS_5.2.txt
@@ -221,11 +221,14 @@ done
Installing Jailkit:
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
./configure
make
make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_DEBIAN_4.0.txt b/INSTALL_DEBIAN_4.0.txt
index 3e9ec963d3..a24c7a4a1a 100644
--- a/INSTALL_DEBIAN_4.0.txt
+++ b/INSTALL_DEBIAN_4.0.txt
@@ -162,12 +162,15 @@ done
Installing Jailkit:
-apt-get install build-essential autoconf automake1.9 libtool flex bison
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
+apt-get install build-essential autoconf automake1.9 libtool flex bison nano cvs
cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
./configure
make
make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_FEDORA_9.txt b/INSTALL_FEDORA_9.txt
index b91003dff5..f499f3fd12 100644
--- a/INSTALL_FEDORA_9.txt
+++ b/INSTALL_FEDORA_9.txt
@@ -204,11 +204,14 @@ done
Installing Jailkit:
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
./configure
make
make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_OPENSUSE_11.txt b/INSTALL_OPENSUSE_11.txt
index f76dd41f2d..3912ff3cb8 100644
--- a/INSTALL_OPENSUSE_11.txt
+++ b/INSTALL_OPENSUSE_11.txt
@@ -189,11 +189,14 @@ done
Installing Jailkit:
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
./configure
make
make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/INSTALL_UBUNTU_8.04.txt b/INSTALL_UBUNTU_8.04.txt
index c3ba560e66..6c064e3011 100644
--- a/INSTALL_UBUNTU_8.04.txt
+++ b/INSTALL_UBUNTU_8.04.txt
@@ -217,13 +217,16 @@ In case you get a permission denied error from apache, please restart the apache
Installing Jailkit:
-apt-get install build-essential autoconf automake1.9 libtool flex bison
+// It is nescessary to use the cvs version of jailjit, as the cvs contains a change
+// which is nescessary for ISPConfig and has not been released yet.
+
+apt-get install build-essential autoconf automake1.9 libtool flex bison nano cvs
cd /tmp
-wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
-tar xvfz jailkit-2.5.tar.gz
-cd jailkit-2.5
+cvs -d:pserver:anonymous@cvs.sv.gnu.org:/sources/jailkit co .
+cd jailkit
./configure
make
make install
-rm -rf jailkit-2.5*
+cd ..
+rm -rf jailkit
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 3996d690a1..3ae2ef24d0 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -91,7 +91,7 @@ class shelluser_base_plugin {
$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']);
--
GitLab