From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sat, 2 Dec 2017 10:07:17 +0000 (+0000)
Subject: local-ldd
X-Git-Tag: archive/raspbian/2.25-3+rpi1^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61d070b6b53737a226044fa884fe94d6bbe1f765;p=glibc.git

local-ldd

2013-05-11  Aurelien Jarno  <aurelien@aurel32.net>

	* elf/ldd.bash.in: Verify the dynamic linker is working before
	using it.

2009-11-08  Aurelien Jarno  <aurelien@aurel32.net>

	* elf/ldd.bash.in: Always trace dynamic library dependencies
	through the dynamic linker.


Gbp-Pq: Topic all
Gbp-Pq: Name local-ldd.diff
---

diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 7dd1fccf2..e3be60b1f 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -150,31 +150,23 @@ for file do
     echo "ldd: ${file}:" $"not regular file" >&2
     result=1
   elif test -r "$file"; then
-    test -x "$file" || echo 'ldd:' $"\
-warning: you do not have execution permission for" "\`$file'" >&2
     RTLD=
     ret=1
     for rtld in ${RTLDLIST}; do
       if test -x $rtld; then
-	verify_out=`${rtld} --verify "$file"`
-	ret=$?
-	case $ret in
-	[02]) RTLD=${rtld}; break;;
-	esac
+	dummy=`$rtld 2>&1` 
+	if test $? = 127; then
+	  verify_out=`${rtld} --verify "$file"`
+	  ret=$?
+	  case $ret in
+	  [02]) RTLD=${rtld}; break;;
+	  esac
+	fi
       fi
     done
     case $ret in
-    0)
-      # If the program exits with exit code 5, it means the process has been
-      # invoked with __libc_enable_secure.  Fall back to running it through
-      # the dynamic linker.
-      try_trace "$file"
-      rc=$?
-      if [ $rc = 5 ]; then
-	try_trace "$RTLD" "$file"
-	rc=$?
-      fi
-      [ $rc = 0 ] || result=1
+    0|2)
+      try_trace "$RTLD" "$file" || result=1
       ;;
     1)
       # This can be a non-ELF binary or no binary at all.
@@ -183,9 +175,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
 	result=1
       }
       ;;
-    2)
-      try_trace "$RTLD" "$file" || result=1
-      ;;
     *)
       echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
       exit 1