From bc16c9898012e463bc6b79c3faa8f81ed54527f7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 7 Oct 2021 18:22:11 -0700 Subject: daemon: Support X servers built with -Dlisten_tcp=true Xorg since version 1.17 doesn't listen to tcp sockets by default unless it's explicitly built with -Dlisten_tcp=true. GDM currently assumes X servers 1.17 and later are always built without specifying -Dlisten_tcp=true and doesn't work properly otherwise. This commit enhances GDM to better handle these non-standard builds by always passing '-nolisten tcp' on the command line when tcp should be disabled, and likewise always passing '-listen tcp' on the command line, assuming the X server is new enough to support it, when tcp should be enabled. Related #704 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index e0c56225..dc16b9e7 100644 --- a/meson.build +++ b/meson.build @@ -71,7 +71,7 @@ x_deps = declare_dependency( ) # Xserver 1.17 & later default to -nolisten and require -listen for remote access xserver_deps = dependency('xorg-server', version : '>=1.17', required : false) -xserver_nolisten_default = xserver_deps.found() +xserver_has_listen = xserver_deps.found() find_x_server_script = find_program('build-aux/find-x-server.sh', native: true) find_x_server_out = run_command(find_x_server_script).stdout().strip() if find_x_server_out != '' @@ -227,7 +227,7 @@ conf.set('HAVE_PAM_SYSLOG', have_pam_syslog) conf.set('HAVE_KEYUTILS', keyutils_dep.found()) conf.set('SUPPORTS_PAM_EXTENSIONS', pam_extensions_supported) conf.set('HAVE_SELINUX', libselinux_dep.found()) -conf.set('HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY', xserver_nolisten_default) +conf.set('HAVE_XSERVER_WITH_LISTEN', xserver_has_listen) conf.set('ENABLE_USER_DISPLAY_SERVER', get_option('user-display-server')) conf.set('ENABLE_SYSTEMD_JOURNAL', get_option('systemd-journal')) conf.set('ENABLE_WAYLAND_SUPPORT', get_option('wayland-support')) -- cgit v1.2.1