diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-03-14 21:12:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-03-14 21:12:49 +0000 |
| commit | 336dfb2d27fdd4c8fb69b5aee7817b595bb23691 (patch) | |
| tree | b1190e254b25453d8f70260cfd6e4d6c64f63d27 /login/utmp_daemon.c | |
| parent | cb9245ba930565190b73f86e032fdbf75ec427a0 (diff) | |
| download | glibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.tar.gz glibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.tar.xz glibc-336dfb2d27fdd4c8fb69b5aee7817b595bb23691.zip | |
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 'login/utmp_daemon.c')
| -rw-r--r-- | login/utmp_daemon.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/login/utmp_daemon.c b/login/utmp_daemon.c index 95e5d4241b..148a472900 100644 --- a/login/utmp_daemon.c +++ b/login/utmp_daemon.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -19,6 +19,7 @@ #include <assert.h> #include <errno.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <sys/socket.h> @@ -83,6 +84,8 @@ setutent_daemon (void) if (daemon_sock < 0) { + int result; + daemon_sock = open_socket (_PATH_UTMPD_RW); if (daemon_sock < 0) { @@ -91,6 +94,16 @@ setutent_daemon (void) if (daemon_sock < 0) return 0; } + + /* We have to make sure the socket is `closed on exec'. */ + result = __fcntl (daemon_sock, F_GETFD, 0); + if (result >= 0) + result = __fcntl (daemon_sock, F_SETFD, flags | FD_CLOEXEC); + if (result == -1) + { + close (daemon_sock); + return 0; + } } /* Send request to the daemon. */ |