From: Derrick Brashear <shadow@dementix.org>
Date: Tue, 11 Oct 2011 18:32:04 +0000 (-0400)
Subject: ukernel: set close-on-exec on our socket
X-Git-Tag: upstream/1.6.1.pre1^2~181
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9549e1bafd62419f2b92f36a7f9719e2152fb42e;p=packages%2Fo%2Fopenafs.git

ukernel: set close-on-exec on our socket

if the process we are in execs a child, it doesn't get our socket

Reviewed-on: http://gerrit.openafs.org/5598
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 87dcfc872c11fdb13ebf0448abe91150aaa86859)

Change-Id: I7e94e5192783c57aa77afc1b583cccda77ec7653
Reviewed-on: http://gerrit.openafs.org/5704
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/rx/UKERNEL/rx_knet.c b/src/rx/UKERNEL/rx_knet.c
index 6692b5444..082ff6860 100644
--- a/src/rx/UKERNEL/rx_knet.c
+++ b/src/rx/UKERNEL/rx_knet.c
@@ -257,6 +257,10 @@ rxk_InitializeSocket(void)
     usr_assert(rc == 0);
 #endif /* AFS_USR_AIX_ENV */
 
+#ifdef FD_CLOEXEC
+    fcntl(sock, F_SETFD, FD_CLOEXEC);
+#endif
+
     usockp->sock = sock;
     usockp->port = lcladdr.sin_port;