From 6386fcef799764e68b65df7872d82a06f39730ea Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sun, 15 Jan 2023 23:37:35 -0800 Subject: [PATCH] meson: Disable XTRANS_SEND_FDS XTRANS_SEND_FDS was disabled by default on darwin with autoconf builds. When we moved to meson, this was enabled. SCM_RIGHTS works well for local connections, but unfortunatley X11 forwarding over ssh is incorrectly identified as a local connection. This is being disabled to restore the previous functionality until a solution can be determined. Fixes: https://github.com/XQuartz/XQuartz/issues/314 Signed-off-by: Jeremy Huddleston Sequoia --- include/meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/meson.build b/include/meson.build index 3521fa3ef..0e32b7b22 100644 --- a/include/meson.build +++ b/include/meson.build @@ -186,10 +186,6 @@ conf_data.set('LISTEN_TCP', get_option('listen_tcp')) conf_data.set('LISTEN_UNIX', get_option('listen_unix')) conf_data.set('LISTEN_LOCAL', get_option('listen_local')) -if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS') - conf_data.set('XTRANS_SEND_FDS', '1') -endif - if conf_data.get('HAVE_GETPEEREID').to_int() == 0 and conf_data.get('HAVE_GETPEERUCRED').to_int() == 0 if not cc.has_header_symbol('sys/socket.h', 'SO_PEERCRED') conf_data.set('NO_LOCAL_CLIENT_CRED', 1)