[src/netbsd-6]: src/libexec/ld.elf_so Pull up following revision(s) (requeste...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1d969c88d21
branches:  netbsd-6
changeset: 775366:c1d969c88d21
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 17 22:36:59 2012 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #605):
        libexec/ld.elf_so/rtld.c: revision 1.159
On failure in _rtld_dlcheck, call _rtld_error, not xwarnx.
Callers need not call _rtld_error themselves now.
Fixes PR lib/41760.  Should add the test case from the PR too.

diffstat:

 libexec/ld.elf_so/rtld.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r b4ff50a8a8ea -r c1d969c88d21 libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Wed Oct 17 22:34:15 2012 +0000
+++ b/libexec/ld.elf_so/rtld.c  Wed Oct 17 22:36:59 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $  */
+/*     $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $        */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -735,7 +735,7 @@
                        break;
 
        if (obj == NULL || obj->dl_refcount == 0) {
-               xwarnx("Invalid shared object handle %p", handle);
+               _rtld_error("Invalid shared object handle %p", handle);
                return NULL;
        }
        return obj;
@@ -1295,7 +1295,6 @@
                }
        } else {
                if ((obj = _rtld_dlcheck(handle)) == NULL) {
-                       _rtld_error("Invalid handle");
                        _rtld_shared_exit();
                        return -1;
                }