From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 3 Jul 2007 14:49:53 +0000 (+0000)
Subject: [BZ #4702]
X-Git-Tag: cvs/glibc-2_6_1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57c9179cab174f606a05b0372600efedd3331b92;p=thirdparty%2Fglibc.git

[BZ #4702]

2007-07-03  Jakub Jelinek  <jakub@redhat.com>
	[BZ #4702]
	* nis/nss-default.c: Include errno.h.
	(init): Preserve errno.
---

diff --git a/ChangeLog b/ChangeLog
index 2f1d93eea8d..0a486671975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-03  Jakub Jelinek  <jakub@redhat.com>
+
+	[BZ #4702]
+	* nis/nss-default.c: Include errno.h.
+	(init): Preserve errno.
+
 2007-07-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/socket.h (PF_UNIX): Update comment.
diff --git a/nis/nss-default.c b/nis/nss-default.c
index 577f7c2d47f..046ddfee8d6 100644
--- a/nis/nss-default.c
+++ b/nis/nss-default.c
@@ -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 const struct
 static void
 init (void)
 {
+  int saved_errno = errno;
   FILE *fp = fopen (default_nss, "rc");
   if (fp != NULL)
     {
@@ -111,6 +113,7 @@ init (void)
 
       fclose (fp);
     }
+  __set_errno (saved_errno);
 }