Fixed: FS#3009 - Jailkit problems either related to wheezy update or jailkit 2.1.16

Till Brehm · Till Brehm · commit 65584a9f04c8 · 2014-02-15T15:56:18.000+01:00
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
@@ -169,7 +169,6 @@ function onAfterInsert() {
 
 		$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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ function onAfterInsert() {`
`169`	`169`
`170`	`170`	`$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;`
`171`	`171`	`$app->db->query($sql);`
`172`		`- die($sql);`
`173`	`172`
`174`	`173`	`}`
`175`	`174`