Support alternate passwd/group locations in tmpfiles #16512
Merged
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
The test binary has two modes: in the default argument-less mode, it just checks that "root" can be resolved. When invoked manually, a root prefix and user/group names can be specified.
This changes the code to allow looking at multiple files with different
prefixes, but uses "/etc" and "/usr/lib". rpm-ostree uses
/usr/lib/{passwd,group} with nss-altfiles. I see no harm in simply trying both
paths on all systems.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1857530.
A minor memory leak is fixed: hashmap_put() returns -EEXIST is the key is
present *and* and the value is different. It return 0 if the value is the
same. Thus, we would leak the user/group name if it was specified multiple
times with the same uid/gid. I opted to remove the warning message completely:
with multiple files it is reasonable to have the same name defined more than
once. But even with one file the warning is dubious: all tools that read those
files deal correctly with duplicate entries and we are not writing a linter.
|
LGTM. |
poettering
reviewed
Jul 21, 2020
| uid_t *ret_uid, | ||
| Hashmap **cache) { | ||
| static int open_passwd_file(const char *root, const char *fname, FILE **ret_file) { | ||
| const char *p = prefix_roota(root, fname); |
There was a problem hiding this comment.
this is weird. both the left hand and the right hand side allocate from the stack... this smells like something the compile might choke on, the same way as it chokes on alloca() in parameters of function call expressions.
i'd really split this up in two lines to avoid any confusion
There was a problem hiding this comment.
also, prefix_roota() can't fail, no need to catch errors here...
There was a problem hiding this comment.
I prepped #16534 which fixes both issues indirectly and is a lot more correct in other ways, too.
poettering
added a commit
to poettering/systemd
that referenced
this pull request
Jul 21, 2020
In case the passwd/group file is symlinked, follow things correctly. Follow-up for: systemd#16512 Addresses: systemd#16512 (comment)
poettering
added a commit
that referenced
this pull request
Jul 21, 2020
In case the passwd/group file is symlinked, follow things correctly. Follow-up for: #16512 Addresses: #16512 (comment)
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.
No description provided.