Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v9] Handle case where display is itself a unix socket #10985

Merged
merged 2 commits into from
Mar 9, 2022

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented Mar 9, 2022

Backport #10719

@Joerger Joerger requested a review from r0mant March 9, 2022 02:20
// It's possible that the display is actually the full path
// to an open XServer socket, such as with xquartz on OSX:
// "/private/tmp/com.apple.com/launchd.xxx/org.xquartz.com:0"
if d.HostName[0] == '/' {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is DISPLAY guaranteed to be an absolute path, if it's a unix socket?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't found documentation about this, but based on the openssh code it looks like it has to be an absolute path ending with :display_num or :display_num.screen_num.

@Joerger Joerger enabled auto-merge (squash) March 9, 2022 17:08
@Joerger Joerger merged commit 124ff22 into branch/v9 Mar 9, 2022
@Joerger Joerger deleted the joerger/v9/fix-x11-xquartz branch March 9, 2022 17:30
@webvictim webvictim mentioned this pull request Apr 19, 2022
@webvictim webvictim mentioned this pull request Jun 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants