diff -Naur freenx-0.5.0.orig/nxsetup freenx-0.5.0/nxsetup
--- freenx-0.5.0.orig/nxsetup	2006-07-07 20:31:35.000000000 -0700
+++ freenx-0.5.0/nxsetup	2006-08-27 23:19:40.000000000 -0700
@@ -24,6 +24,7 @@
 BUILD_KNOWN_HOSTS="yes"
 AUTOMATIC="no"
 IGNORE_ERRORS="no"
+OVERRIDE="no"
 
 while [ "$1" ]
 do
@@ -41,6 +42,7 @@
 		--uninstall) UNINSTALL="yes"; shift ;;
 		--purge) PURGE="yes"; shift ;;
 		--auto) AUTOMATIC="yes"; shift ;;
+		--override) OVERRIDE="yes"; shift ;;
 		--) shift ; break ;;
 		*) echo "Invalid flag $1" ; HELP="yes"; shift ; break ;;
 	esac
@@ -54,7 +56,7 @@
 [ "$UNINSTALL" = "yes" -a "$CLEAN" = "yes" ] && HELP="yes"
 [ "$SETUP_SSH2_KEY" = "yes" -a "$SETUP_NOMACHINE_KEY" = "no" ] && HELP="yes"
 
-if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" ]
+if [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" -a "$AUTOMATIC" = "no" -a "$HELP" = "no" -a "$OVERRIDE" = "yes" ] 
 then
 	echo "------> You did select no action."
 	echo "        FreeNX guesses that you want to _install_ the server."
@@ -70,6 +72,20 @@
 
 [ "$INSTALL" = "no" -a "$UNINSTALL" = "no" ] && HELP="yes"
 
+if [ "$OVERRIDE" = "no" ]
+then
+	echo "Your FreeNX server was already setup and configured by the RPM."
+	echo
+	echo "You should only need to copy the client.id_dsa.key from /etc/nxserver to your client,"
+	echo "then properly import the key into the client setup. Only proceed with nxsetup if you"
+	echo "know exactly what you are doing."
+	echo
+	echo "To bypass this message, add the following to the nxsetup arguments:"
+	echo "  --override"
+	echo
+	exit 0
+fi
+
 if [ "$HELP" = "yes" ]
 then
 	echo "nxsetup - Setup the FreeNX server."