From owner-svn-src-stable@FreeBSD.ORG  Tue Jun 30 03:05:50 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A37C31065670;
	Tue, 30 Jun 2009 03:05:50 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 911298FC19;
	Tue, 30 Jun 2009 03:05:50 +0000 (UTC) (envelope-from kan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5U35ovu066384;
	Tue, 30 Jun 2009 03:05:50 GMT (envelope-from kan@svn.freebsd.org)
Received: (from kan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5U35o1I066382;
	Tue, 30 Jun 2009 03:05:50 GMT (envelope-from kan@svn.freebsd.org)
Message-Id: <200906300305.n5U35o1I066382@svn.freebsd.org>
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Tue, 30 Jun 2009 03:05:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195180 - stable/7/libexec/rtld-elf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2009 03:05:51 -0000

Author: kan
Date: Tue Jun 30 03:05:50 2009
New Revision: 195180
URL: http://svn.freebsd.org/changeset/base/195180

Log:
  MFC r194298:
  
  FreeBSD returns main object handle from dlopen(NULL, ...) calls.
  dlsym seaches using this handle are expected to look for symbol
  definitions in all objects loaded at the program start time along
  with all objects currently in RTLD_GLOBAL scope.

Modified:
  stable/7/libexec/rtld-elf/   (props changed)
  stable/7/libexec/rtld-elf/rtld.c

Modified: stable/7/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/7/libexec/rtld-elf/rtld.c	Mon Jun 29 23:53:27 2009	(r195179)
+++ stable/7/libexec/rtld-elf/rtld.c	Tue Jun 30 03:05:50 2009	(r195180)
@@ -1966,6 +1966,16 @@ do_dlsym(void *handle, const char *name,
 	    /* Search main program and all libraries loaded by it. */
 	    def = symlook_list(name, hash, &list_main, &defobj, ve, flags,
 			       &donelist);
+
+	    /*
+	     * We do not distinguish between 'main' object and global scope.
+	     * If symbol is not defined by objects loaded at startup, continue
+	     * search among dynamically loaded objects with RTLD_GLOBAL
+	     * scope.
+	     */
+	    if (def == NULL)
+		def = symlook_list(name, hash, &list_global, &defobj, ve,
+		    		    flags, &donelist);
 	} else {
 	    Needed_Entry fake;