Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ldconfig: Restore handling for /etc/ld-elf.so.conf #2083

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

bsdjhb
Copy link
Collaborator

@bsdjhb bsdjhb commented Apr 11, 2024

The original change to factor out the ldconfig_paths helper function
accidentally dropped it due to a variable name mismatch (_ldconf vs
_soconf). As a result, the 4th argument looked unused so I removed
it. Rather than re-adding the 4th argument to the helper, just
include /etc/ld-elf.so.conf in the list of paths used in the second
for loop.

The original change to factor out the ldconfig_paths helper function
accidentally dropped it due to a variable name mismatch (_ldconf vs
_soconf).  As a result, the 4th argument looked unused so I removed
it.  Rather than re-adding the 4th argument to the helper, just
include /etc/ld-elf.so.conf in the list of paths used in the second
for loop.
@bsdjhb bsdjhb merged commit 37699f0 into CTSRD-CHERI:dev Apr 15, 2024
28 checks passed
@bsdjhb bsdjhb deleted the ldconfig_fixup branch April 15, 2024 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant