about summary refs log tree commit diff
path: root/elf/dl-open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-05 04:24:45 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-05 04:24:45 +0000
commitdd272e5774a6a64a0380c4dab5f0424c3ca66897 (patch)
tree062c52a5f81229a4d7faa6847a10369d7efa906c /elf/dl-open.c
parentf213ef02800eba75bcc5d4c5aaa5a19f5f6235fe (diff)
downloadglibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.tar.gz
glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.tar.xz
glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.zip
Update.
	* sysdeps/generic/ldsodefs.h: Don't define _dl_name_match_p as inline.
	* elf/dl-misc.c: Define _dl_name_match_p here.
	* elf/dl-open.c (check_libc_caller): Don't use _dl_name_match_p.
Diffstat (limited to 'elf/dl-open.c')
-rw-r--r--elf/dl-open.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 4a322e28e8..9befbc41cf 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -177,16 +177,32 @@ check_libc_caller (const void *caller)
       struct link_map *l;
 
       for (l = GL(dl_loaded); l != NULL; l = l->l_next)
-	if (_dl_name_match_p (expected1, l))
+	if (strcmp (expected1, l->l_name) == 0)
 	  {
+	  is_1:
 	    expected1_from = (const void *) l->l_map_start;
 	    expected1_to = (const void *) l->l_map_end;
 	  }
-	else if (_dl_name_match_p (expected2, l))
+	else if (strcmp (expected1, l->l_name) == 0)
 	  {
+	  is_2:
 	    expected2_from = (const void *) l->l_map_start;
 	    expected2_to = (const void *) l->l_map_end;
 	  }
+	else
+	  {
+	    struct libname_list *runp = l->l_libname;
+
+	    while (runp != NULL)
+	      {
+		if (strcmp (expected1, runp->name) == 0)
+		  goto is_1;
+		else if (strcmp (expected2, runp->name) == 0)
+		  goto is_2;
+
+		runp = runp->next;
+	      }
+	  }
 
       assert (expected1_from != NULL);
     }