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.

Sign up for GitHub

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

Jump to bottom

Fix x11 server config issues #10471

Merged
merged 10 commits into from
Feb 25, 2022
Merged

Fix x11 server config issues #10471

merged 10 commits into from
Feb 25, 2022

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented Feb 18, 2022 •
edited
Loading

This PR introduces a few minor fixes to the x11 server config.

Changes:

  • file config yaml:ssh_service.x11.max_displays -> ssh_service.x11.max_display
    • This name actually fits the functionality
    • max_displays will be supported until v10 in case someone has already started using it
  • ServerConfig.X11.MaxDisplays will now default to displayOffset + x11.MaxServerDisplays rather than x11.MaxServerDisplays
    • This is more in line with OpenSSH with has has displayOffset=10 and maxDisplay=1009
  • Return an error when displayOffset > maxDisplay
  • Fixed other typos
  • Fixed and improved some tests

@Joerger Joerger marked this pull request as ready for review February 18, 2022 21:00
@github-actions github-actions bot requested review from codingllama and lxea February 18, 2022 21:00
codingllama
codingllama reviewed Feb 21, 2022
View reviewed changes
lib/config/fileconf.go Outdated Show resolved Hide resolved
lib/config/fileconf.go Outdated Show resolved Hide resolved
lib/config/fileconf_test.go Outdated Show resolved Hide resolved
lib/config/fileconf_test.go Outdated Show resolved Hide resolved
lib/config/fileconf_test.go Outdated Show resolved Hide resolved
@Joerger Joerger force-pushed the joerger/x11-config-fixes branch from ecf6ee7 to b66c61f Compare February 22, 2022 18:17
@Joerger Joerger enabled auto-merge (squash) February 23, 2022 19:33
@Joerger Joerger merged commit a03d867 into master Feb 25, 2022
@Joerger Joerger deleted the joerger/x11-config-fixes branch February 25, 2022 19:30
Joerger added a commit that referenced this pull request Mar 2, 2022
@Joerger
Fix x11 server config issues (#10471)
2eeda2e
@Joerger Joerger mentioned this pull request Mar 2, 2022
Merged
r0mant pushed a commit that referenced this pull request Mar 2, 2022
@Joerger
Fix x11 server config issues (#10471) (#10758)
6427764
@webvictim webvictim mentioned this pull request Mar 4, 2022
Closed
@alexatcanva alexatcanva mentioned this pull request Oct 13, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lxea lxea lxea approved these changes

@codingllama codingllama codingllama approved these changes

@r0mant r0mant r0mant approved these changes

Assignees
No one assigned
Labels
backport-required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Joerger @r0mant @lxea @codingllama