--- /var/tmp/portage/nxserver-freenx-0.2.7/work/freenx-0.2.7/nxclient	2004-10-14 19:31:02.000000000 +0100
+++ nxclient	2005-01-02 19:46:44.563439528 +0000
@@ -4,11 +4,14 @@
 #           (c) 2004 by Rick Stout <zipsonic@gmail.com>
 
 # Note: NX does not check the exit-code from nxclient,
-#       but we set it to a "good value" anyway in case 
+#       but we set it to a "good value" anyway in case
 #       it does check it someday.
-
 # First check if the commercial nxclient is available and use it
-[ -x /usr/NX/bin/nxclient ] && exec /usr/NX/bin/nxclient "$@"
+
+# but check that it isn't this script to prevent a loop!
+NXCLIENT="/usr/NX/bin/nxclient"
+[ -x ${NXCLIENT} -a "`file -bi ${NXCLIENT}`" != 'application/x-shellscript' ] \
+	&& exec ${NXCLIENT} "$@"
 
 TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display: -n $(basename $0) -- "$@"`