summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-23 02:10:14 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-05-23 02:32:32 -0700
commit5a388b27a094c71b4214aa744b2ba0fdda7fd607 (patch)
tree9b2ac3cf437631edd5d7d9f1a5811ab5dabc7bc5 /os
parent77b688a73025238ed9fe286a2bae8f78da65fce3 (diff)
XQuartz: Add the launchd fd to AllSockets as well
(cherry picked from commit 83f72529394be5871671d73b6ef4f8bc83708f8a)
Diffstat (limited to 'os')
-rw-r--r--os/connection.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/os/connection.c b/os/connection.c
index 316e347f2..38521e686 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1324,15 +1324,17 @@ _X_EXPORT void ListenOnOpenFD(int fd) {
ListenTransFds[ListenTransCount] = fd;
FD_SET(fd, &WellKnownConnections);
+ FD_SET(fd, &AllSockets);
- /* It is always local
- if (!_XSERVTransIsLocal(ciptr)) {
- // DefineSelf (fd);
- }
- */
-
/* Increment the count */
ListenTransCount++;
+
+ /* This *might* be needed, but it seems to be working fine without it... */
+ //ResetAuthorization();
+ //ResetHosts(display);
+#ifdef XDMCP
+ //XdmcpReset();
+#endif
}
#endif