fix: broken build when crypt_preferred_method is not defined #17158
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
crypt.h might not have crypt_preferred_method which breaks the build. Fix by adding crypt_preferred_method parser in meson.build and checking for HAVE_CRYPT_PREFERRED_METHOD macro. Tested on CentOS 8 with libxcrypt-4.1.1 installed.
Member
|
hmm, crypt_preferred_method was added in libxcrypt 4.4 apparently |
poettering
requested changes
Sep 25, 2020
| ['crypt_ra', crypt_header], | ||
| ['crypt_gensalt_ra', crypt_header]] | ||
| ['crypt_gensalt_ra', crypt_header], | ||
| ['crypt_preferred_method', crypt_header]] |
Member
There was a problem hiding this comment.
please keep the indented table structure in place, i.e. reindent the first two rows' second column to match the third row
| int make_salt(char **ret) { | ||
|
|
||
| #if HAVE_CRYPT_GENSALT_RA | ||
| #if ((HAVE_CRYPT_GENSALT_RA) && (HAVE_CRYPT_PREFERRED_METHOD)) |
Member
There was a problem hiding this comment.
hmm, i think a nicer fix would be to just hardcode $6$ as default prefix if crypt_preferred_method is not available. i.e. see the other ifdef branch here, it also uses $6$ as default prefix. i.e. instead of bypassing the whole crypt_gensalt_ra() branch just add a fallback for the crypt_preferred_method() call
Member
|
/cc @keszybz |
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
crypt.h might not have crypt_preferred_method which breaks the build.
Fix by adding crypt_preferred_method parser in meson.build and checking
for HAVE_CRYPT_PREFERRED_METHOD macro.
Tested on CentOS 8 with libxcrypt-4.1.1 installed.