* elf/ldd.bash.in: If --verify loop fails to find a dynamic linker

	for the file don't just try the first one listed in RTLDLIST
	again.  We already have the status.

diff --git a/ChangeLog b/ChangeLog
index b701bae..502b3fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-30  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/ldd.bash.in: If --verify loop fails to find a dynamic linker
+       for the file don't just try the first one listed in RTLDLIST
+       again.  We already have the status.
+
        * nis/nss_nisplus/nisplus-publickey.c (parse_grp_str): PIDLIST is
        supposed to have NGRPS elements.
 

diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index a22ad15..d1591a5 100644 (file)
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -154,6 +154,7 @@ for file do
     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"`
@@ -163,12 +164,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
        esac
       fi
     done
-    if test -z "${RTLD}"; then
-      set ${RTLDLIST}
-      RTLD=$1
-      verify_out=`${RTLD} --verify "$file"`
-      ret=$?
-    fi
     case $ret in
     0)
       # If the program exits with exit code 5, it means the process has been