From 65584a9f04c8bde3a4fc2d882363a4f504246c01 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 15 Feb 2014 15:56:18 +0100
Subject: [PATCH] Fixed: FS#3009 - Jailkit problems either related to wheezy
 update or jailkit 2.1.16

---
 interface/web/sites/shell_user_edit.php | 1 -
 server/scripts/create_jailkit_user.sh   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 5a54b339e..3c72a5f84 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -169,7 +169,6 @@ class page_action extends tform_actions {
 
 		$sql = "UPDATE shell_user SET server_id = $server_id, dir = '$dir', puser = '$uid', pgroup = '$gid', sys_groupid = '$sys_groupid' WHERE shell_user_id = ".$this->id;
 		$app->db->query($sql);
-		die($sql);
 
 	}
 
diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh
index da01f9af9..5e1060be2 100755
--- a/server/scripts/create_jailkit_user.sh
+++ b/server/scripts/create_jailkit_user.sh
@@ -21,12 +21,12 @@ CHROOT_SHELL=$4
 CHROOT_P_USER=$5
 CHROOT_P_USER_HOMEDIR=$6
 
-### Add the chroot user ###
-jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME
-
 ### Reconfigure the chroot home directory for the user ###
 usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME 2>/dev/null
 
+### Add the chroot user ###
+jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME
+
 ### We have to reconfigure the chroot home directory for the parent user ###
 if [ "$CHROOT_P_USER" != "" ]; then
   usermod --home=$CHROOT_HOMEDIR/.$CHROOT_P_USER_HOMEDIR $CHROOT_P_USER 2>/dev/null
-- 
GitLab