[PATCH 1/1] ListenOnOpenFD: Remove Resets since this is intended to be for hotplugging connections

Jeremy Huddleston Sequoia jeremyhu at apple.com
Mon Jul 28 11:44:38 PDT 2014


pharris says that the resets should not be done in the hotplugging case.

This may fix a crash reported against XQuartz:
http://xquartz.macosforge.org/trac/ticket/869

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
CC: Peter Harris <pharris at opentext.com>
CC: Kristian Høgsberg <krh at bitplanet.net>
---
 os/connection.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/os/connection.c b/os/connection.c
index 40d9ff3..f915e12 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
 
     /* Increment the count */
     ListenTransCount++;
-
-    /* This *might* not be needed... /shrug */
-    ResetAuthorization();
-    ResetHosts(display);
-#ifdef XDMCP
-    XdmcpReset();
-#endif
 }
 
 /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
-- 
2.0.1



More information about the xorg-devel mailing list