diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-07-18 02:17:44 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-07-18 03:36:10 +0200 |
| commit | 1e1693929eca32333885d76ddabbea965d14b45f (patch) | |
| tree | 66c073ab91438dcf4a8a047082041b08ab96f398 /nx-X11/programs/Xserver/os | |
| parent | 992673157077080f3d5637c7f666e43639181a91 (diff) | |
| download | nx-libs-1e1693929eca32333885d76ddabbea965d14b45f.tar.gz nx-libs-1e1693929eca32333885d76ddabbea965d14b45f.tar.bz2 nx-libs-1e1693929eca32333885d76ddabbea965d14b45f.zip | |
[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
Diffstat (limited to 'nx-X11/programs/Xserver/os')
| -rw-r--r-- | nx-X11/programs/Xserver/os/xdmcp.c | 17 |
1 files changed, 17 insertions, 0 deletions
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) { |