diff -u nxnode nxnode.new
--- nxnode	2004-07-30 22:20:56.000000000 +0200
+++ nxnode.new	2004-08-27 01:10:38.921035504 +0200
@@ -17,7 +17,7 @@
 
 # constants
 
-NX_DIR=/usr/NX.free
+NX_DIR=/usr
 
 read CMDLINE
 
@@ -144,7 +144,7 @@
 		P=""
 		[ -n "$agent_user" ] && U="-u $agent_user"
 		[ -n "$agent_password" ] && P="-p $agent_password"
-		LD_LIBRARY_PATH="/usr/NX.free/lib" /usr/NX.free/bin/nxdesktop -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)" -keyboard $keyboard -geometry $geometry $U $P $agent_server 2>>~/.nx/C-$sess_id/session &
+		/usr/bin/nxdesktop -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)" -keyboard $keyboard -geometry $geometry $U $P $agent_server 2>>~/.nx/C-$sess_id/session &
 	else
 
 	# nxviewer session
@@ -152,8 +152,8 @@
 	if [ "$type" = "vnc" ]
 	then
 		mkdir -p ~/.nx/C-$sess_id/scripts/
-		echo "$agent_password" | /usr/NX.free/bin/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit
-		LD_LIBRARY_PATH="/usr/NX.free/lib" /usr/NX.free/bin/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)"  $agent_server 2>>~/.nx/C-$sess_id/session &
+		echo "$agent_password" | /usr/bin/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit
+		/usr/bin/nxviewer -encodings tight hextile copyrect raw -passwd ~/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)"  $agent_server 2>>~/.nx/C-$sess_id/session &
 	else
 		# backwards compatibility
 		K=""
@@ -165,7 +165,7 @@
 
 
 	# "normal" nxagent session
-		LD_LIBRARY_PATH="/usr/NX.free/lib" /usr/NX.free/bin/nxagent -persistent -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)" $K $G $B :$display 2>>~/.nx/C-$sess_id/session &
+		/usr/bin/nxagent -persistent -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)" $K $G $B :$display 2>>~/.nx/C-$sess_id/session &
 	fi
 	fi
 	PID=$!
diff -u nxserver nxserver.new
--- nxserver	2004-07-30 22:20:49.000000000 +0200
+++ nxserver.new	2004-08-26 18:18:50.000000000 +0200
@@ -19,9 +19,10 @@
 
 # Important constants
 
-NX_DIR=/usr/NX.free
-NX_SESS_DIR=$NX_DIR/var/db/
-NX_ETC_DIR=$NX_DIR/etc/
+NX_DIR=/usr/
+NX_SESS_DIR=/var/lib/nxserver/
+NX_ETC_DIR=/etc/nxserver/
+NX_HOME_DIR=/home/.nx/
 VERSION="1.4.0-01"
 LICENSE="OS (GPL)"
 LOGGING=1
@@ -89,7 +90,7 @@
 	cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig
 	echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords
 	# deactivated to avoid problems with comm-server
-	#su - $PASSDB_CHUSER -c "mkdir -p ~/.ssh; cat $NX_ETC_DIR/users.id_dsa.pub >> ~/.ssh/authorized_keys2; chmod 600 ~/.ssh/authorized_keys2"
+	su - $PASSDB_CHUSER -c "mkdir -p ~/.ssh; cat $NX_ETC_DIR/users.id_dsa.pub >> ~/.ssh/authorized_keys2; chmod 600 ~/.ssh/authorized_keys2"
 }
 
 passdb_list_user()
@@ -683,23 +684,23 @@
 
 cmd_start()
 {
-	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] && cmd_abort "ERROR: Service already running"
-	mv $NX_DIR/home/nx/.ssh/authorized_keys2.disabled $NX_DIR/home/nx/.ssh/authorized_keys2
+	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] && cmd_abort "ERROR: Service already running"
+	mv $NX_HOME_DIR/.ssh/authorized_keys2.disabled $NX_HOME_DIR/.ssh/authorized_keys2
 	echo "NX> 122 Service started"
 }
 
 cmd_stop()
 {
-	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] || cmd_abort "Service was already stopped"
-	mv $NX_DIR/home/nx/.ssh/authorized_keys2 $NX_DIR/home/nx/.ssh/authorized_keys2.disabled
+	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] || cmd_abort "Service was already stopped"
+	mv $NX_HOME_DIR/.ssh/authorized_keys2 $NX_HOME_DIR/.ssh/authorized_keys2.disabled
 	# TODO: Stop all running sessions
 	echo "NX> 123 Service stopped"
 }
 
 cmd_status()
 {
-	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] && "NX> 110 NX Server is running"
-	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] || "NX> 110 NX Server is stopped"
+	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] && "NX> 110 NX Server is running"
+	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] || "NX> 110 NX Server is stopped"
 }
 
 cmd_restart()
@@ -850,7 +851,7 @@
 			# is it a "good" session?
 			if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
 			then
-				su - "$cmd_user" -c "$NX_DIR/bin/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
+				su - "$cmd_user" -c "/usr/NX/bin/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
 				disown $!
 			fi
 	done
Nur in nxserver: nxserver.1.