lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* nis/nis_call.c (nis_server_cache_search): Save errno around stat

Browse Source 
call.
	(__nisfind_server): Similar for open readColdStartFile call.
	Patch partially by Jim Meyering.
	* nss/nss_files/files-XXX.c (_nss_files_getXXent_r): Save errno
	around internal_setent call.
This commit is contained in:
Ulrich Drepper
2008-03-24 19:28:00 +00:00
parent 7e570c5520
commit 0facd3df4b
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2008-03-24 Ulrich Drepper <drepper@redhat.com> 2008-03-24 Ulrich Drepper <drepper@redhat.com>
* nis/nis_call.c (nis_server_cache_search): Save errno around stat
call.
(__nisfind_server): Similar for open readColdStartFile call.
Patch partially by Jim Meyering.
* nss/nss_files/files-XXX.c (_nss_files_getXXent_r): Save errno
around internal_setent call.
* po/vi.po: New Vietnamese translation. * po/vi.po: New Vietnamese translation.
* sysdeps/unix/sysv/linux/adjtime.c: Correctly use * sysdeps/unix/sysv/linux/adjtime.c: Correctly use

6
nis/nis_call.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997, 1998, 2001, 2004, 2005, 2006, 2007 /* Copyright (C) 1997, 1998, 2001, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@ -592,8 +592,10 @@ nis_server_cache_search (const_nis_name name, int search_parent,
XDR xdrs; XDR xdrs;
struct stat64 st; struct stat64 st;
int saved_errno = errno;
if (stat64 ("/var/nis/NIS_COLD_START", &st) < 0) if (stat64 ("/var/nis/NIS_COLD_START", &st) < 0)
st.st_mtime = nis_cold_start_mtime + 1; st.st_mtime = nis_cold_start_mtime + 1;
__set_errno (saved_errno);
__libc_lock_lock (nis_server_cache_lock); __libc_lock_lock (nis_server_cache_lock);
@ -741,7 +743,9 @@ __nisfind_server (const_nis_name name, int search_parent,
return result; return result;
} }
int saved_errno = errno;
*dir = readColdStartFile (); *dir = readColdStartFile ();
__set_errno (saved_errno);
if (*dir == NULL) if (*dir == NULL)
/* No /var/nis/NIS_COLD_START->no NIS+ installed. */ /* No /var/nis/NIS_COLD_START->no NIS+ installed. */
return NIS_UNAVAIL; return NIS_UNAVAIL;

7
nss/nss_files/files-XXX.c
View File

@ -1,5 +1,6 @@
/* Common code for file-based databases in nss_files module. /* Common code for file-based databases in nss_files module.
Copyright (C) 1996-1999,2001,2002,2004,2007 Free Software Foundation, Inc. Copyright (C) 1996-1999,2001,2002,2004,2007,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -254,8 +255,12 @@ CONCAT(_nss_files_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer,
/* Be prepared that the set*ent function was not called before. */ /* Be prepared that the set*ent function was not called before. */
if (stream == NULL) if (stream == NULL)
{ {
int save_errno = errno;
status = internal_setent (0); status = internal_setent (0);
__set_errno (errno);
if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0) if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
{ {
fclose (stream); fclose (stream);