From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 12 Jul 2007 15:36:23 +0000 (+0000)
Subject: 2007-07-03  Jakub Jelinek  <jakub@redhat.com>
X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eff61d5bf192516c4b075983fe899ad4ababb312;p=thirdparty%2Fglibc.git

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 8130e5f62ec..fbf5f1be2da 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-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf/dl-sysdep.c (_dl_important_hwcaps): Add integer overflow check.
diff --git a/nis/nss-default.c b/nis/nss-default.c
index 577f7c2d47f..ab160b210bf 100644
--- a/nis/nss-default.c
+++ b/nis/nss-default.c
@@ -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);
 }