XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

2 files changed, 32 insertions, 12 deletions

diff --git a/config/Xaccess b/config/Xaccess
index c83cc18..f0672ef 100644
--- a/config/Xaccess
+++ b/config/Xaccess
@@ -1,6 +1,5 @@
 # $Xorg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
-#
-# $XFree86: xc/programs/xdm/config/Xaccess,v 1.3 2001/01/17 23:45:24 dawes Exp $
+# $XFree86: xc/programs/xdm/config/Xaccess,v 1.4 2003/07/09 15:27:40 tsi Exp $
 #
 # Access control file for XDMCP connections
 #
@@ -24,6 +23,10 @@
 #
 #       %name		list of hosts ...
 #
+# To control which addresses xdm listens for requests on:
+#
+#	LISTEN		address [list of multicast groups ... ]
+#
 # The first form tells xdm which displays to respond to itself.
 # The second form tells xdm to forward indirect queries from hosts matching
 # the specified pattern to the indicated list of hosts.
@@ -32,6 +35,9 @@
 # address and display the results on the terminal.
 # The fourth form is similar to the third, except instead of using the
 # broadcast address, it sends DirectQuerys to each of the hosts in the list
+# The fifth form tells xdm which addresses to listen for incoming connections
+# on.  If present, xdm will only listen for connections on the specified 
+# interfaces and/or multicast groups.
 #
 # In all cases, xdm uses the first entry which matches the terminal;
 # for IndirectQuery messages only entries with right hand sides can
@@ -68,3 +74,17 @@
 #%hostlist	host-a host-b
 
 #*		CHOOSER %hostlist	#
+
+#
+# If you have a machine with multiple network interfaces or IP addresses
+# you can control which interfaces accept XDMCP packets by listing a LISTEN
+# line for each interface you want to listen on.  You can additionally list
+# one or more multicast groups after each address to listen on those groups
+# on that address.
+#
+# If no LISTEN is specified, the default is the same as "LISTEN *" - listen on
+# all unicast interfaces, but not for multicast packets.  If any LISTEN lines
+# are specified, then only the listed interfaces will be listened on.
+#
+
+#LISTEN		* ff02::1 
diff --git a/config/Xresources.cpp b/config/Xresources.cpp
index d64de52..46d2cf0 100644
--- a/config/Xresources.cpp
+++ b/config/Xresources.cpp
@@ -3,7 +3,7 @@
 !
 !
 !
-! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.6 2003/01/04 03:11:31 dawes Exp $
+! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.7 2003/11/15 03:25:22 dawes Exp $
 !
 #define BS \ /* cpp can be trickier than m4 */
 #define NLBS \n\ /* don't remove these comments */
@@ -28,19 +28,19 @@ xlogin*namePrompt: \040\040\040\040\040\040\040Login:
 #endif /* XPM */
 xlogin*fail: Login incorrect
 #ifdef XPM
-/**/#if WIDTH > 800
+XHASHif WIDTH > 800
 xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
 xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
 xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
 xlogin*failFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
-/**/#else
+XHASHelse
 xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
 xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
 xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
 xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-/**/#endif
+XHASHendif
 #endif /* XPM */
-/**/#ifdef COLOR
+XHASHifdef COLOR
 #ifndef XPM
 xlogin*greetColor: CadetBlue
 #else
@@ -56,7 +56,7 @@ xlogin*greetColor: Blue3
 xlogin*failColor: red
 *Foreground: black
 *Background: #fffff0
-/**/#else
+XHASHelse
 #ifdef XPM
 xlogin*borderWidth: 3
 xlogin*frameWidth: 0
@@ -68,13 +68,13 @@ xlogin*borderWidth: 3
 xlogin*Foreground: black
 xlogin*Background: white
 #endif /* XPM */
-/**/#endif
+XHASHendif
 #ifdef XPM
-/**/#if PLANES >= 8
+XHASHif PLANES >= 8
 xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-/**/#else
+XHASHelse
 xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
-/**/#endif
+XHASHendif
 xlogin*useShape: true
 xlogin*logoPadding: 10
 #endif /* XPM */