daemon.cc: Clean up PeerInfo by using std::optional #14723
+21
−23
Conversation
This file contains hidden or 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
xokdvium
reviewed
Dec 5, 2025
| struct passwd * pw = peer.uidKnown ? getpwuid(peer.uid) : 0; | ||
| std::string user = pw ? pw->pw_name : std::to_string(peer.uid); | ||
| auto pw = peer.uid ? getpwuid(*peer.uid) : nullptr; | ||
| std::string user = pw ? pw->pw_name : peer.uid ? std::to_string(*peer.uid) : ""; |
Contributor
There was a problem hiding this comment.
The empty string case seems suspicious
Member
Author
There was a problem hiding this comment.
It's better than the previous behavior where it would call std::to_string() on an uninitialized uid field. The empty string won't match with anything in trusted-user except *.
Contributor
There was a problem hiding this comment.
But all the code paths from getPeerInfo initialized all members or failed with a SysError (which gets removed now). What's the rationale for it? That was needed for the TCP store somehow?
Contributor
There was a problem hiding this comment.
Is in, shouldn't the unix socket keep getting the same error handling treatment?
Member
|
Yay thanks for extracting this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
Taken from #5265.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.