[commits] r747 - in /fsf/trunk/libc: ChangeLog resolv/mapv4v6addr.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Nov 22 00:01:40 2006
New Revision: 747

Log:
Import glibc-mainline for 2006-11-22

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/resolv/mapv4v6addr.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov 22 00:01:40 2006
@@ -1,3 +1,7 @@
+2006-10-21  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* resolv/mapv4v6addr.h (map_v4v6_address): Fix last change.
+
 2006-11-20  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit.
@@ -24,6 +28,7 @@
 	* po/nl.po: Update from translation team.
 
 	* timezone/zdump.c: Redo fix for BZ #3137.
+
 2006-11-14  Jakub Jelinek  <jakub@xxxxxxxxxx>
 
 	* nss/nss_files/files-alias.c (get_next_alias): Set line back

Modified: fsf/trunk/libc/resolv/mapv4v6addr.h
==============================================================================
--- fsf/trunk/libc/resolv/mapv4v6addr.h (original)
+++ fsf/trunk/libc/resolv/mapv4v6addr.h Wed Nov 22 00:01:40 2006
@@ -59,7 +59,7 @@
   int i;
 
   /* Move the IPv4 part to the right position.  */
-  memcpy (src + 12, src, INADDRSZ);
+  memcpy (dst + 12, src, INADDRSZ);
 
   /* Mark this ipv6 addr as a mapped ipv4. */
   for (i = 0; i < 10; i++)