summaryrefslogtreecommitdiff
path: root/sysdeps/generic/utmp_file.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-03-14 21:12:49 +0000
committerUlrich Drepper <drepper@redhat.com>1999-03-14 21:12:49 +0000
commit336dfb2d27fdd4c8fb69b5aee7817b595bb23691 (patch)
treeb1190e254b25453d8f70260cfd6e4d6c64f63d27 /sysdeps/generic/utmp_file.c
parentcb9245ba930565190b73f86e032fdbf75ec427a0 (diff)
Update.
1999-03-13 Mark Kettenis <kettenis@gnu.org> * sysdeps/unix/bsd/getpt.c (__getpt): Do not use `isatty' to check if the opened master pty really is a pty. `isatty' checks for tty-ness and a pty is not a tty. Return ENOENT instead of ENFILE if we are out of pty's. 1999-03-13 Mark Kettenis <kettenis@gnu.org> * sysdeps/generic/utmp_file.c (setutent_file): Make sure the just opened file is closed on exec. * login/utmp_daemon.c (setutent_daemon): Likewise for the just opened socket. 1999-03-13 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/llio.texi (File Position Primitive): Reformat @end command. Patch by Bruno Haible <haible@ilog.fr> [PR libc/1020]. * nscd/nscd_getpw_r.c (nscd_getpw_r): Set `errno' correctly if no entry is found. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
Diffstat (limited to 'sysdeps/generic/utmp_file.c')
-rw-r--r--sysdeps/generic/utmp_file.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c
index ddf49467ef..74e91fb948 100644
--- a/sysdeps/generic/utmp_file.c
+++ b/sysdeps/generic/utmp_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>
and Paul Janzen <pcj@primenet.com>, 1996.
@@ -114,6 +114,7 @@ setutent_file (void)
if (file_fd < 0)
{
const char *file_name;
+ int result;
file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name);
@@ -125,6 +126,16 @@ setutent_file (void)
if (file_fd == -1)
return 0;
}
+
+ /* We have to make sure the file is `closed on exec'. */
+ result = __fcntl (file_fd, F_GETFD, 0);
+ if (result >= 0)
+ result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC);
+ if (result == -1)
+ {
+ close (file_fd);
+ return 0;
+ }
}
__lseek (file_fd, 0, SEEK_SET);