- 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

@@ -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

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

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

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

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
 

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']);