Author: branden Date: 2004-03-25 11:51:49 -0500 (Thu, 25 Mar 2004) New Revision: 1174
Added: trunk/debian/patches/077_xdm_honor_request_port_zero.diff Modified: trunk/debian/changelog Log: Restore original xdm behavior of interpreting an XDMCP request port of zero (the default) as an instruction not to open a port at all. Equivalent code was apparently accidentally deleted in upstream CVS (thanks, Jeff King). (Closes: #239341) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-03-23 07:50:04 UTC (rev 1173) +++ trunk/debian/changelog 2004-03-25 16:51:49 UTC (rev 1174) @@ -11,8 +11,13 @@ non-GNU-libc systems) in XFree86 X server by including correct header file for ntohl() prototype (thanks, Erik Andersen). (Closes: #216806) - -- Branden Robinson <[EMAIL PROTECTED]> Tue, 23 Mar 2004 01:49:03 -0500 + * Restore original xdm behavior of interpreting an XDMCP request port of + zero (the default) as an instruction not to open a port at all. + Equivalent code was apparently accidentally deleted in upstream CVS + (thanks, Jeff King). (Closes: #239341) + -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 11:44:58 -0500 + xfree86 (4.3.0-7) unstable; urgency=medium * Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop. Added: trunk/debian/patches/077_xdm_honor_request_port_zero.diff =================================================================== --- trunk/debian/patches/077_xdm_honor_request_port_zero.diff 2004-03-23 07:50:04 UTC (rev 1173) +++ trunk/debian/patches/077_xdm_honor_request_port_zero.diff 2004-03-25 16:51:49 UTC (rev 1174) @@ -0,0 +1,31 @@ +$Id$ + +Restore original xdm behavior of interpreting an XDMCP request port of zero +as an instruction not to open a port at all. + +Equivalent code was apparently accidentally deleted in upstream CVS +3.10.4.1. Thanks to Jeff King for catching this. (See Debian bug +#239341.) + +This patch by Branden Robinson, based on the original 1988 X Consortium +code. + +--- xc/programs/xdm/socket.c~ 2004-03-25 11:35:51.000000000 -0500 ++++ xc/programs/xdm/socket.c 2004-03-25 11:39:48.000000000 -0500 +@@ -64,6 +64,16 @@ + CreateWellKnownSockets (void) + { + char *name = localHostname (); ++ ++ /* ++ * A request port of zero means that a socket should not be opened. ++ */ ++ if (request_port == 0) ++ { ++ Debug ("request port is zero; not creating a chooser socket\n"); ++ return; ++ } ++ + registerHostname (name, strlen (name)); + + chooserFd = socket (AF_INET, SOCK_STREAM, 0); Property changes on: trunk/debian/patches/077_xdm_honor_request_port_zero.diff ___________________________________________________________________ Name: svn:keywords + Id