qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* shadow/lckpwdf.c (__lckpwdf): Use O_CLOEXEC if possible.

This commit is contained in:
Ulrich Drepper 2007-08-11 02:56:12 +00:00
parent d7e23b02a4
commit 7cf89e9599
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2007-08-10 Ulrich Drepper <drepper@redhat.com> 2007-08-10 Ulrich Drepper <drepper@redhat.com>
* shadow/lckpwdf.c (__lckpwdf): Use O_CLOEXEC if possible.
* nscd/connections.c: Use O_CLOEXEC is possible. Use mkostemp * nscd/connections.c: Use O_CLOEXEC is possible. Use mkostemp
instead of mkstemp. instead of mkstemp.

42
shadow/lckpwdf.c
View File

@ -1,5 +1,5 @@
/* Handle locking of password file. /* Handle locking of password file.
Copyright (C) 1996,98,2000,02 Free Software Foundation, Inc. Copyright (C) 1996, 1998, 2000, 2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@ -26,6 +26,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/file.h> #include <sys/file.h>
#include <kernel-features.h>
/* Name of the lock file. */ /* Name of the lock file. */
#define PWD_LOCKFILE "/etc/.pwd.lock" #define PWD_LOCKFILE "/etc/.pwd.lock"
@ -96,20 +98,38 @@ __lckpwdf (void)
/* Prevent problems caused by multiple threads. */ /* Prevent problems caused by multiple threads. */
__libc_lock_lock (lock); __libc_lock_lock (lock);
lock_fd = __open (PWD_LOCKFILE, O_WRONLY | O_CREAT, 0600); int oflags = O_WRONLY | O_CREAT;
#ifdef O_CLOEXEC
oflags |= O_CLOEXEC;
#endif
lock_fd = __open (PWD_LOCKFILE, oflags, 0600);
if (lock_fd == -1) if (lock_fd == -1)
/* Cannot create lock file. */ /* Cannot create lock file. */
RETURN_CLOSE_FD (-1); RETURN_CLOSE_FD (-1);
/* Make sure file gets correctly closed when process finished. */ #ifndef __ASSUME_O_CLOEXEC
flags = __fcntl (lock_fd, F_GETFD, 0); # ifdef O_CLOEXEC
if (flags == -1) if (__have_o_cloexec <= 0)
/* Cannot get file flags. */ # endif
RETURN_CLOSE_FD (-1); {
flags |= FD_CLOEXEC; /* Close on exit. */ /* Make sure file gets correctly closed when process finished. */
if (__fcntl (lock_fd, F_SETFD, flags) < 0) flags = __fcntl (lock_fd, F_GETFD, 0);
/* Cannot set new flags. */ if (flags == -1)
RETURN_CLOSE_FD (-1); /* Cannot get file flags. */
RETURN_CLOSE_FD (-1);
# ifdef O_CLOEXEC
if (__have_o_cloexec == 0)
__have_o_cloexec = (flags & FD_CLOEXEC) == 0 ? -1 : 1;
if (__have_o_cloexec < 0)
# endif
{
flags |= FD_CLOEXEC; /* Close on exit. */
if (__fcntl (lock_fd, F_SETFD, flags) < 0)
/* Cannot set new flags. */
RETURN_CLOSE_FD (-1);
}
}
#endif
/* Now we have to get exclusive write access. Since multiple /* Now we have to get exclusive write access. Since multiple
process could try this we won't stop when it first fails. process could try this we won't stop when it first fails.