Skip to content

Commit

Permalink
meson: Disable XTRANS_SEND_FDS
Browse files Browse the repository at this point in the history
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: XQuartz/XQuartz#314
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
  • Loading branch information
jeremyhu committed Jan 17, 2023
1 parent 2eb9abc commit 6386fce
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions include/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6386fce

Please sign in to comment.