[commits] r7594 - in /fsf/trunk/libc: ChangeLog login/utmp_file.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Dec 24 00:01:59 2008
New Revision: 7594

Log:
Import glibc-mainline for 2008-12-24

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/login/utmp_file.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Dec 24 00:01:59 2008
@@ -1,3 +1,8 @@
+2008-12-13  Klaus Dittrich  <kladit@xxxxxxxx>
+
+	* login/utmp_file.c (pututline_file): Replace call to dup2 with
+	libc internal symbol __dup2 to avoid access through the PLT.
+
 2008-12-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #6545]

Modified: fsf/trunk/libc/login/utmp_file.c
==============================================================================
--- fsf/trunk/libc/login/utmp_file.c (original)
+++ fsf/trunk/libc/login/utmp_file.c Wed Dec 24 00:01:59 2008
@@ -437,7 +437,7 @@
 #endif
 
       if (__lseek64 (new_fd, __lseek64 (file_fd, 0, SEEK_CUR), SEEK_SET) == -1
-	  || dup2 (new_fd, file_fd) < 0)
+	  || __dup2 (new_fd, file_fd) < 0)
 	{
 	  close_not_cancel_no_status (new_fd);
 	  return NULL;