summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2014-07-23 11:53:33 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2014-08-11 12:52:52 -0700
commitb7a24467f738bfd9437e8de02ed5e44409054185 (patch)
treede0a8c44add11f47cf04035fb1465e674b98e6ab /os
parenta793483e38bfb8af19877f69e873c1776de18d1f (diff)
ListenOnOpenFD: Remove Resets since this is intended to be for hotplugging connections
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@apple.com> Reviewed-by: Peter Harris <pharris@opentext.com> (cherry picked from commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75)
Diffstat (limited to 'os')
-rw-r--r--os/connection.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/os/connection.c b/os/connection.c
index 40d9ff39b..f915e1295 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) */