[pull] main from systemd:main #377
Merged
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
No functional change, just preparation for later change.
It is only used by test cases. Not necessary to keep it.
Also, tests for make_salt() in test-user-util.c are moved to test-libcrypt-util.c.
Major distributions already have libseccomp 2.5.x or newer. Let's bump to the required minimum version to 2.4.0, which provides SCMP_ACT_KILL_PROCESS, SCMP_ACT_LOG, SCMP_ARCH_PARISC, and SCMP_ARCH_PARISC64. Note, libseccomp 2.4.0 was released on 2019-03-15. See also #38608.
libcrypt was no longer built by default since glibc-2.38, and it has been completely removed since glibc-2.39. Let's always use libxcrypt, unless when building with musl. As already major distribution already have libxcrypt-4.4.x, hence let's also bump the required minimum version to 4.4.0. libxcrypt cannot be built with musl, hence the previous fallback logic in libcrypt-util.c are moved to musl/crypt.c. Note, libxcrypt-4.4.0 was released on 2018-11-20. See also #38608.
libcrypt is only used by firstboot, homed, and sysusers, which can be disabled by meson option. Let's not require the library unconditionally.
Note, this drops logging only test case for crypt_preferred_method(), as that requires explicitly dlopen() the library. But, we should test that make_salt() and friends automatically dlopen() it.
This drops support of libcrypt provided by glibc, and always use libxcrypt. This also makes libxcrypt dlopen() dependency.
libpam uses pamh in its function declarations for the plugin API so let's use the same name in our tree as well. Making sure the plugin function definitions match the plugin function declarations is required to enable clang-tidy's readability-inconsistent-declaration-parameter-name check, but to keep things consistent everywhere we opt to use pamh tree-wide.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )