[commits] r2712 - in /fsf/trunk/libc: ChangeLog nis/nss-default.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jul  4 00:03:21 2007
New Revision: 2712

Log:
Import glibc-mainline for 2007-07-04

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nis/nss-default.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul  4 00:03:21 2007
@@ -1,3 +1,9 @@
+2007-07-03  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	[BZ #4702]
+	* nis/nss-default.c: Include errno.h.
+	(init): Preserve errno.
+
 2007-07-02  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/bits/socket.h (PF_UNIX): Update comment.

Modified: fsf/trunk/libc/nis/nss-default.c
==============================================================================
--- fsf/trunk/libc/nis/nss-default.c (original)
+++ fsf/trunk/libc/nis/nss-default.c Wed Jul  4 00:03:21 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2001, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +17,7 @@
    02111-1307 USA.  */
 
 #include <ctype.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdio_ext.h>
 #include <stdlib.h>
@@ -54,6 +55,7 @@
 static void
 init (void)
 {
+  int saved_errno = errno;
   FILE *fp = fopen (default_nss, "rc");
   if (fp != NULL)
     {
@@ -111,6 +113,7 @@
 
       fclose (fp);
     }
+  __set_errno (saved_errno);
 }