--- alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/08/03 17:57:55	278
+++ alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/09/06 07:45:00	325
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.7 2005-08-03 17:57:55 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.8 2005-09-06 07:45:00 niro Exp $
 # configures the x11 server on the host via mysql db settings
 
 get_x11_settings()
@@ -94,6 +94,7 @@
 	local xserver
 	local xfconfig
 	local HAS_VNC
+	local HAS_REALVNC
 
 	#xfree or xorg ?
 	xserver="$(readlink /usr/X11R6/bin/X)"
@@ -119,6 +120,13 @@
 		HAS_VNC="no"
 	fi
 
+	if [ -f /usr/X11R6/lib/modules/extensions/vnc.so ]
+	then
+		HAS_REALVNC="yes"
+	else
+		HAS_REALVNC="no"
+	fi
+
 	#show which server we use
 	echo -en ${COLOREDSTAR}"Using '${xserver}' as x11-server "
 
@@ -126,6 +134,9 @@
 	if [ "${HAS_VNC}" = "yes" ]
 	then
 		echo "with vnc enabled ..."
+	elif [ "${HAS_REALVNC}" = "yes" ]
+	then
+		echo "with realvnc enabled ..."
 	else
 		echo "..."
 	fi
@@ -149,6 +160,7 @@
 	echo '    Load       "dri"' >> ${xfconfig}
 
 	[ "${HAS_VNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}
+	[ "${HAS_REALVNC}" = "yes" ] && echo '    Load       "vnc"' >> ${xfconfig}
 
 	echo 'EndSection' >> ${xfconfig}
 
@@ -322,6 +334,13 @@
 	echo "        Modes       \"${ALX_RESOLUTION}\"" >> ${xfconfig}
 	echo '        ViewPort    0 0' >> ${xfconfig}
 	echo '    EndSubsection' >> ${xfconfig}
+
+	if [ "${HAS_REALVNC}" = "yes" ]
+	then
+		echo '    Option "SecurityTypes" "VncAuth"' >> ${xfconfig}
+		echo '    Option "UserPasswdVerifier" "VncAuth"' >> ${xfconfig}
+		echo '    Option "PasswordFile" "/root/.vnc/passwd"' >> ${xfconfig}
+	fi
 	echo 'EndSection' >> ${xfconfig}
 
 	#server layout