Skip to content

N
nx-libs
Commit 1e169392 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

[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: 's avatarJon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: 's avatarColin Harrison <colin.harrison@virgin.net> Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de
parent 99267315
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 0 deletions
nx-X11/programs/Xserver/os/xdmcp.c
View file @ 1e169392
...@@ -53,6 +53,11 @@ ...@@ -53,6 +53,11 @@
#endif #endif
#define XSERV_t
#define TRANS_SERVER
#define TRANS_REOPEN
#include <nx-X11/Xtrans/Xtrans.h>
#ifdef XDMCP #ifdef XDMCP
#undef REQUEST #undef REQUEST
...@@ -243,6 +248,14 @@ XdmcpUseMsg (void) ...@@ -243,6 +248,14 @@ XdmcpUseMsg (void)
ErrorF("-displayID display-id manufacturer display ID for request\n"); 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 int
XdmcpOptions(int argc, char **argv, int i) XdmcpOptions(int argc, char **argv, int i)
{ {
...@@ -250,11 +263,13 @@ 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++); get_manager_by_name(argc, argv, i++);
XDM_INIT_STATE = XDM_QUERY; XDM_INIT_STATE = XDM_QUERY;
AccessUsingXdmcp (); AccessUsingXdmcp ();
XdmcpDefaultListen();
return (i + 1); return (i + 1);
} }
if (strcmp(argv[i], "-broadcast") == 0) { if (strcmp(argv[i], "-broadcast") == 0) {
XDM_INIT_STATE = XDM_BROADCAST; XDM_INIT_STATE = XDM_BROADCAST;
AccessUsingXdmcp (); AccessUsingXdmcp ();
XdmcpDefaultListen();
return (i + 1); return (i + 1);
} }
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
...@@ -262,6 +277,7 @@ XdmcpOptions(int argc, char **argv, int i) ...@@ -262,6 +277,7 @@ XdmcpOptions(int argc, char **argv, int i)
i = get_mcast_options(argc, argv, ++i); i = get_mcast_options(argc, argv, ++i);
XDM_INIT_STATE = XDM_MULTICAST; XDM_INIT_STATE = XDM_MULTICAST;
AccessUsingXdmcp (); AccessUsingXdmcp ();
XdmcpDefaultListen();
return (i + 1); return (i + 1);
} }
#endif #endif
...@@ -269,6 +285,7 @@ XdmcpOptions(int argc, char **argv, int i) ...@@ -269,6 +285,7 @@ XdmcpOptions(int argc, char **argv, int i)
get_manager_by_name(argc, argv, i++); get_manager_by_name(argc, argv, i++);
XDM_INIT_STATE = XDM_INDIRECT; XDM_INIT_STATE = XDM_INDIRECT;
AccessUsingXdmcp (); AccessUsingXdmcp ();
XdmcpDefaultListen();
return (i + 1); return (i + 1);
} }
if (strcmp(argv[i], "-port") == 0) { if (strcmp(argv[i], "-port") == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment