rpms/glibc/FC-4 glibc-bz2451.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13339

Modified Files:
	glibc-bz2451.patch 
Log Message:
2.3.6-4


glibc-bz2451.patch:
 Makefile     |   12 ++++++++++--
 dl-load.c    |   22 ++++++++++++++++------
 tst-leaks1.c |   25 +++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 8 deletions(-)

Index: glibc-bz2451.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-bz2451.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-bz2451.patch	5 May 2006 19:50:25 -0000	1.1
+++ glibc-bz2451.patch	5 May 2006 20:38:37 -0000	1.2
@@ -54,16 +54,16 @@
 +tst-leaks1-ENV = MALLOC_TRACE=$(objpfx)tst-leaks1.mtrace
 --- libc/elf/dl-load.c	17 Oct 2005 20:59:28 -0000	1.273
 +++ libc/elf/dl-load.c	15 Mar 2006 19:20:04 -0000	1.274
-@@ -1491,7 +1491,7 @@ print_search_path (struct r_search_path_
-    this could mean there is something wrong in the installation and the
+@@ -1554,7 +1555,7 @@ print_search_path (struct r_search_path_
     user might want to know about this.  */
  static int
--open_verify (const char *name, struct filebuf *fbp)
-+open_verify (const char *name, struct filebuf *fbp, bool free_name)
+ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
+-	     int whatcode, bool *found_other_class)
++	     int whatcode, bool *found_other_class, bool free_name)
  {
    /* This is the expected ELF header.  */
  #define ELF32_CLASS ELFCLASS32
-@@ -1551,6 +1551,12 @@ open_verify (const char *name, struct fi
+@@ -1635,6 +1636,12 @@ open_verify (const char *name, struct fi
  	  errstring = (errval == 0
  		       ? N_("file too short") : N_("cannot read file data"));
  	call_lose:
@@ -76,34 +76,35 @@
  	  lose (errval, fd, name, NULL, NULL, errstring);
  	}
  
-@@ -1728,7 +1734,7 @@ open_path (const char *name, size_t name
+@@ -1821,7 +1828,8 @@ open_path (const char *name, size_t name
  	  if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))
  	    _dl_debug_printf ("  trying file=%s\n", buf);
  
--	  fd = open_verify (buf, fbp);
-+	  fd = open_verify (buf, fbp, false);
+-	  fd = open_verify (buf, fbp, loader, whatcode, found_other_class);
++	  fd = open_verify (buf, fbp, loader, whatcode, found_other_class,
++			    false);
  	  if (this_dir->status[cnt] == unknown)
  	    {
  	      if (fd != -1)
-@@ -1965,7 +1971,7 @@ _dl_map_object (struct link_map *loader,
- 
- 	      if (cached != NULL)
+@@ -2098,7 +2106,7 @@ _dl_map_object (struct link_map *loader,
  		{
--		  fd = open_verify (cached, &fb);
-+		  fd = open_verify (cached, &fb, false);
+ 		  fd = open_verify (cached,
+ 				    &fb, loader ?: GL(dl_ns)[nsid]._ns_loaded,
+-				    LA_SER_CONFIG, &found_other_class);
++				    LA_SER_CONFIG, &found_other_class, false);
  		  if (__builtin_expect (fd != -1, 1))
  		    {
  		      realname = local_strdup (cached);
-@@ -2001,7 +2007,7 @@ _dl_map_object (struct link_map *loader,
- 	fd = -1;
-       else
+@@ -2136,7 +2144,7 @@ _dl_map_object (struct link_map *loader,
  	{
--	  fd = open_verify (realname, &fb);
-+	  fd = open_verify (realname, &fb, true);
+ 	  fd = open_verify (realname, &fb,
+ 			    loader ?: GL(dl_ns)[nsid]._ns_loaded, 0,
+-			    &found_other_class);
++			    &found_other_class, true);
  	  if (__builtin_expect (fd, 0) == -1)
  	    free (realname);
  	}
-@@ -2028,8 +2034,11 @@ _dl_map_object (struct link_map *loader,
+@@ -2166,8 +2174,11 @@ _dl_map_object (struct link_map *loader,
  	  if ((name_copy = local_strdup (name)) == NULL
  	      || (l = _dl_new_object (name_copy, name, type, loader,
  				      mode, nsid)) == NULL)