From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 12 Mar 1998 12:21:41 +0000 (+0000)
Subject: (dl_main): Install link maps for preloaded objects using main_map as loader.
X-Git-Tag: cvs/before-sparc-2_0_x-branch~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55347ca87e2410922a9c0fc86048f6ae7aa1b2d9;p=thirdparty%2Fglibc.git

(dl_main): Install link maps for preloaded objects using main_map as loader.
---

diff --git a/elf/rtld.c b/elf/rtld.c
index c69584856f0..492504b3038 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -368,8 +368,8 @@ of this helper program; chances are you did not intend to run this program.\n",
       while ((p = strsep (&list, " :")) != NULL)
 	if (! __libc_enable_secure || strchr (p, '/') == NULL)
 	  {
-	    struct link_map *new_map = _dl_map_object (NULL, p, 1, lt_library,
-						       0);
+	    struct link_map *new_map = _dl_map_object (main_map, p, 1,
+						       lt_library, 0);
 	    if (new_map->l_opencount == 1)
 	      /* It is no duplicate.  */
 	      ++npreloads;
@@ -431,7 +431,7 @@ of this helper program; chances are you did not intend to run this program.\n",
 	  runp = file + strspn (file, ": \t\n");
 	  while ((p = strsep (&runp, ": \t\n")) != NULL)
 	    {
-	      struct link_map *new_map = _dl_map_object (NULL, p, 1,
+	      struct link_map *new_map = _dl_map_object (main_map, p, 1,
 							 lt_library, 0);
 	      if (new_map->l_opencount == 1)
 		/* It is no duplicate.  */
@@ -445,7 +445,7 @@ of this helper program; chances are you did not intend to run this program.\n",
       if (problem != NULL)
 	{
 	  char *p = strndupa (problem, file_size - (problem - file));
-	  struct link_map *new_map = _dl_map_object (NULL, p, 1,
+	  struct link_map *new_map = _dl_map_object (main_map, p, 1,
 						     lt_library, 0);
 	  if (new_map->l_opencount == 1)
 	    /* It is no duplicate.  */