sshd: fix startWhenNeeded and listenAddresses combination #56326
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, if startWhenNeeded was set, listenAddresses option was ignored and daemon was listening on all interfaces. Fixes NixOS#56325.
|
@GrahamcOfBorg test openssh |
vcunat
reviewed
Feb 25, 2019
| socketConfig.ListenStream = if cfg.listenAddresses != [] then | ||
| map (l: "${l.addr}:${toString (if l.port != null then l.port else 22)}") cfg.listenAddresses | ||
| else | ||
| cfg.ports; |
There was a problem hiding this comment.
Eh, this means IPv6 addresses in listenAddresses have to be enclosed in brackets, right? Maybe that's a bit confusing, though I haven't studied nixos customs there.
There was a problem hiding this comment.
@vcunat good point! I'll try to find some solution for it...
There was a problem hiding this comment.
It seems that sshd understands [ipv6]:port notation as well: https://linux.die.net/man/5/sshd_config.
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Previously, if startWhenNeeded was set, listenAddresses option was
ignored and daemon was listening on all interfaces.
Fixes #56325.
This should probably be backported as well.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)