--- nxnode	2007-03-09 01:38:18.000000000 +0100
+++ /usr/local/src/freenx/freenx/freenx-server/trunk/nxnode	2007-03-08 19:07:01.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # Free implementation of nxserver components
 #
@@ -513,7 +513,6 @@
 	#
 	# Cleanup session information
 	#	
-	node_stop_services
 	
 	rm -f "$USER_FAKE_HOME/.nx/C-$sess_id/pids/agent"
 	node_terminate_session "$sess_id" "$NODE_FAILED"
@@ -792,7 +791,7 @@
 	
 	trap "" EXIT
 	
-	#[ "$1" = "restore" ] ||	node_stop_services
+	[ "$1" = "restore" ] ||	node_stop_services
 	# close all open file descriptors
 	exec 0<&-
 	exec 1>&-
@@ -1278,7 +1277,6 @@
 	;;
 	--addprinter)
 		cmd_node_addprinter &>/dev/null </dev/null &
-		sleep 10
 	;;
 	--check)
 		echo "NX> 716 finished"