From 1e1693929eca32333885d76ddabbea965d14b45f Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Wed, 18 Jul 2018 02:17:44 +0200
Subject: [PATCH] os: XDMCP options like -query etc. should imply -listen tcp

Backported from X.org:

  commit 491cf02e191e70c5ce24c19da880bb79bebfc03c
  Author: Jon TURNEY <jon.turney@dronecode.org.uk>
  Date:   Tue Feb 10 2015 14:37:26 +0000

    [PATCH] os: XDMCP options like -query etc. should imply -listen tcp

    In X server 1.17, the default configuration is now -nolisten tcp.  In this
    configuration, XDMCP options don't work usefully, as the X server is not
    listening on the port for the display that it tells the display manager to
    connect to.

    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Colin Harrison <colin.harrison@virgin.net>

Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de
---
 nx-X11/programs/Xserver/os/xdmcp.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'nx-X11/programs')

diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index c1aa57e95..3a077d8f4 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -53,6 +53,11 @@
 
 #endif
 
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include <nx-X11/Xtrans/Xtrans.h>
+
 #ifdef XDMCP
 #undef REQUEST
 
@@ -243,6 +248,14 @@ XdmcpUseMsg (void)
     ErrorF("-displayID display-id  manufacturer display ID for request\n");
 }
 
+static void
+XdmcpDefaultListen(void)
+{
+    /* Even when configured --disable-listen-tcp, we should listen on tcp in
+       XDMCP modes */
+    _XSERVTransListen("tcp");
+}
+
 int 
 XdmcpOptions(int argc, char **argv, int i)
 {
@@ -250,11 +263,13 @@ XdmcpOptions(int argc, char **argv, int i)
 	get_manager_by_name(argc, argv, i++);
 	XDM_INIT_STATE = XDM_QUERY;
 	AccessUsingXdmcp ();
+        XdmcpDefaultListen();
 	return (i + 1);
     }
     if (strcmp(argv[i], "-broadcast") == 0) {
 	XDM_INIT_STATE = XDM_BROADCAST;
 	AccessUsingXdmcp ();
+        XdmcpDefaultListen();
 	return (i + 1);
     }
 #if defined(IPv6) && defined(AF_INET6)
@@ -262,6 +277,7 @@ XdmcpOptions(int argc, char **argv, int i)
 	i = get_mcast_options(argc, argv, ++i);
 	XDM_INIT_STATE = XDM_MULTICAST;
 	AccessUsingXdmcp ();
+        XdmcpDefaultListen();
 	return (i + 1);
     }
 #endif
@@ -269,6 +285,7 @@ XdmcpOptions(int argc, char **argv, int i)
 	get_manager_by_name(argc, argv, i++);
 	XDM_INIT_STATE = XDM_INDIRECT;
 	AccessUsingXdmcp ();
+        XdmcpDefaultListen();
 	return (i + 1);
     }
     if (strcmp(argv[i], "-port") == 0) {
-- 
cgit v1.2.3