Attachment #38265 for bug #61874

View | Details | Raw Unified | Return to bug 61874
Collapse All | Expand All





# constants

NX_DIR=/usr

read CMDLINE


		P=""
		[ -n "$agent_user" ] && U="-u $agent_user"
		[ -n "$agent_password" ] && P="-p $agent_password"
		/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

	if [ "$type" = "vnc" ]
	then
		mkdir -p ~/.nx/C-$sess_id/scripts/
		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=""



	# "normal" nxagent 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=$!





# Important constants

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

	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"
}

passdb_list_user()


cmd_start()
{
	[ -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_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_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()

			# is it a "good" session?
			if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
			then
				su - "$cmd_user" -c "/usr/NX/bin/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
				disown $!
			fi
	done

Return to bug 61874

Lines 17-23 Link Here

(-)nxnode (-5 / +5 lines)
17		17
18	# constants	18	# constants
19		19
20	NX_DIR=/usr/NX.free	20	NX_DIR=/usr
21		21
22	read CMDLINE	22	read CMDLINE
23		23
Lines 144-150 Link Here
144	P=""	144	P=""
145	[ -n "$agent_user" ] && U="-u $agent_user"	145	[ -n "$agent_user" ] && U="-u $agent_user"
146	[ -n "$agent_password" ] && P="-p $agent_password"	146	[ -n "$agent_password" ] && P="-p $agent_password"
147	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 &	147	/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 &
148	else	148	else
149		149
150	# nxviewer session	150	# nxviewer session
Lines 152-159 Link Here
152	if [ "$type" = "vnc" ]	152	if [ "$type" = "vnc" ]
153	then	153	then
154	mkdir -p ~/.nx/C-$sess_id/scripts/	154	mkdir -p ~/.nx/C-$sess_id/scripts/
155	echo "$agent_password" \| /usr/NX.free/bin/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit	155	echo "$agent_password" \| /usr/bin/nxpasswd ~/.nx/C-$sess_id/scripts/.passwd doit
156	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 &	156	/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 &
157	else	157	else
158	# backwards compatibility	158	# backwards compatibility
159	K=""	159	K=""
Lines 165-171 Link Here
165		165
166		166
167	# "normal" nxagent session	167	# "normal" nxagent session
168	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 &	168	/usr/bin/nxagent -persistent -name "NX - $user@$HOSTNAME:$display - $session (GPL Edition)" $K $G $B :$display 2>>~/.nx/C-$sess_id/session &
169	fi	169	fi
170	fi	170	fi
171	PID=$!	171	PID=$!

Lines 19-27 Link Here

(-)nxserver (-11 / +12 lines)
19		19
20	# Important constants	20	# Important constants
21		21
22	NX_DIR=/usr/NX.free	22	NX_DIR=/usr/
23	NX_SESS_DIR=$NX_DIR/var/db/	23	NX_SESS_DIR=/var/lib/nxserver/
24	NX_ETC_DIR=$NX_DIR/etc/	24	NX_ETC_DIR=/etc/nxserver/
		25	NX_HOME_DIR=/home/.nx/
25	VERSION="1.4.0-01"	26	VERSION="1.4.0-01"
26	LICENSE="OS (GPL)"	27	LICENSE="OS (GPL)"
27	LOGGING=1	28	LOGGING=1
Lines 89-95 Link Here
89	cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig	90	cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig
90	echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords	91	echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords
91	# deactivated to avoid problems with comm-server	92	# deactivated to avoid problems with comm-server
92	#su - $PASSDB_CHUSER -c "mkdir -p ~/.ssh; cat $NX_ETC_DIR/users.id_dsa.pub >> ~/.ssh/authorized_keys2; chmod 600 ~/.ssh/authorized_keys2"	93	su - $PASSDB_CHUSER -c "mkdir -p ~/.ssh; cat $NX_ETC_DIR/users.id_dsa.pub >> ~/.ssh/authorized_keys2; chmod 600 ~/.ssh/authorized_keys2"
93	}	94	}
94		95
95	passdb_list_user()	96	passdb_list_user()
Lines 683-705 Link Here
683		684
684	cmd_start()	685	cmd_start()
685	{	686	{
686	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] && cmd_abort "ERROR: Service already running"	687	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] && cmd_abort "ERROR: Service already running"
687	mv $NX_DIR/home/nx/.ssh/authorized_keys2.disabled $NX_DIR/home/nx/.ssh/authorized_keys2	688	mv $NX_HOME_DIR/.ssh/authorized_keys2.disabled $NX_HOME_DIR/.ssh/authorized_keys2
688	echo "NX> 122 Service started"	689	echo "NX> 122 Service started"
689	}	690	}
690		691
691	cmd_stop()	692	cmd_stop()
692	{	693	{
693	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] \|\| cmd_abort "Service was already stopped"	694	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] \|\| cmd_abort "Service was already stopped"
694	mv $NX_DIR/home/nx/.ssh/authorized_keys2 $NX_DIR/home/nx/.ssh/authorized_keys2.disabled	695	mv $NX_HOME_DIR/.ssh/authorized_keys2 $NX_HOME_DIR/.ssh/authorized_keys2.disabled
695	# TODO: Stop all running sessions	696	# TODO: Stop all running sessions
696	echo "NX> 123 Service stopped"	697	echo "NX> 123 Service stopped"
697	}	698	}
698		699
699	cmd_status()	700	cmd_status()
700	{	701	{
701	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] && "NX> 110 NX Server is running"	702	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] && "NX> 110 NX Server is running"
702	[ -f $NX_DIR/home/nx/.ssh/authorized_keys2 ] \|\| "NX> 110 NX Server is stopped"	703	[ -f $NX_HOME_DIR/.ssh/authorized_keys2 ] \|\| "NX> 110 NX Server is stopped"
703	}	704	}
704		705
705	cmd_restart()	706	cmd_restart()
Lines 850-856 Link Here
850	# is it a "good" session?	851	# is it a "good" session?
851	if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"	852	if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
852	then	853	then
853	su - "$cmd_user" -c "$NX_DIR/bin/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &	854	su - "$cmd_user" -c "/usr/NX/bin/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
854	disown $!	855	disown $!
855	fi	856	fi
856	done	857	done