about summary refs log tree commit diff
path: root/login
diff options
context:
space:
mode:
Diffstat (limited to 'login')
-rw-r--r--login/utmp_daemon.c15
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.  */