From 1ab4008b32e5e41de440363b6fa556d4888a95eb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Oct 2009 07:41:31 -0400
Subject: [PATCH] Fix: FS#866 - bad handling of environment variables with jailkit ssh users in server/conf/bash.bashrc.master

---
 server/plugins-available/shelluser_jailkit_plugin.inc.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index b915e9f..60524ba 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -85,15 +85,15 @@
 				$this->app = $app;
 				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
 				
-				$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
-				exec($command);
-				
 				$this->_update_website_security_level();
-				
-				$this->_add_jailkit_user();
 			
 				$this->_setup_jailkit_chroot();
 				
+				$this->_add_jailkit_user();
+				
+				$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
+				exec($command);
+				
 				$this->_update_website_security_level();
 			}
 		

--
Gitblit v1.9.1