summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-04-05 06:07:14 -0400
committerAnthony G. Basile <blueness@gentoo.org>2015-04-05 06:07:14 -0400
commit4df34beb36448ed09e45779a0570bc0c2a070975 (patch)
tree5589bb13473e3c0b49d84133614c41ba71ab74aa
parent77ada7caca7d68e40cc8df6f026183474b250d4f (diff)
downloadhardened-dev-4df34beb36448ed09e45779a0570bc0c2a070975.tar.gz
hardened-dev-4df34beb36448ed09e45779a0570bc0c2a070975.tar.bz2
hardened-dev-4df34beb36448ed09e45779a0570bc0c2a070975.tar.xz
hardened-dev-4df34beb36448ed09e45779a0570bc0c2a070975.zip
sys-apps/ldconfig: unconditionally add listed directories.
-rw-r--r--sys-apps/ldconfig/files/ldconfig-0.111
1 files changed, 3 insertions, 8 deletions
diff --git a/sys-apps/ldconfig/files/ldconfig-0.1 b/sys-apps/ldconfig/files/ldconfig-0.1
index 55db851..722cbee 100644
--- a/sys-apps/ldconfig/files/ldconfig-0.1
+++ b/sys-apps/ldconfig/files/ldconfig-0.1
@@ -59,10 +59,9 @@ expand() {
line=${line//:/ }
line=${line//,/ }
for l in $line; do
- if [[ -d $l ]]; then
- repeated $l $drs && continue
- drs+=" $l "
- fi
+ #We must add this whether or not the directory exists
+ repeated $l $drs && continue
+ drs+=" $l "
done
done < $f
done
@@ -112,12 +111,8 @@ sanitize() {
get_options "$@"
drs=$(read_ldso_conf "$LDSO_CONF")
-for f in $LDSO_CONF.d/*; do
- drs="$drs $(read_ldso_conf "$f")"
-done
drs=$(sanitize $drs)
-#LDSO_PATH=$(readelf -l /bin/bash | grep -o '\/lib\/ld-musl-.*\.so\.1')
LDSO_PATH=$(ls /lib/ld-musl-*.so.1)
if [[ ! -e $LDSO_PATH ]]; then
echo "$LDSO_PATH not found" >&2